X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=linux%2FMakefile.top;h=6b209dcfed77291a7092643dc0407eafb34668d8;hb=2516c77cfccf8ecfb30ccfc8ef8bc94eacbd28c8;hp=1ebb8586c68126ae942446ea68023b6551afd9d0;hpb=5018cc2da57e555b620750f33dce6b1c964e612a;p=ppp.git

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 1ebb858..6b209dc 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,23 +1,26 @@
 # PPP top-level Makefile for Linux.
 
 
-BINDIR = /usr/sbin
-MANDIR = /usr/man
-ETCDIR = /etc/ppp
+BINDIR = $(DESTDIR)/usr/sbin
+INCDIR = $(DESTDIR)/usr/include
+MANDIR = $(DESTDIR)/usr/man
+ETCDIR = $(DESTDIR)/etc/ppp
 
 # uid 0 = root
-INSTALL= install -o 0 -g daemon
+INSTALL= install
 
 all:
 	cd chat; $(MAKE) $(MFLAGS) all
+	cd pppd/plugins; $(MAKE) $(MFLAGS) all
 	cd pppd; $(MAKE) $(MFLAGS) all
 	cd pppstats; $(MAKE) $(MFLAGS) all
 	cd pppdump; $(MAKE) $(MFLAGS) all
 
-install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
+install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp install-devel
 
 install-progs:
 	cd chat; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
+	cd pppd/plugins; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
 	cd pppd; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
 	cd pppstats; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
 	cd pppdump; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
@@ -25,6 +28,9 @@ install-progs:
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
 	$(ETCDIR)/chap-secrets
 
+install-devel:
+	cd pppd; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) INCDIR=$(INCDIR) $(MFLAGS) install-devel
+
 $(ETCDIR)/options:
 	$(INSTALL) -c -m 644 etc.ppp/options $@
 $(ETCDIR)/pap-secrets:
@@ -44,6 +50,7 @@ clean:
 	rm -f `find . -name 'core' -print`
 	rm -f `find . -name '*~' -print`
 	cd chat; $(MAKE) clean
+	cd pppd/plugins; $(MAKE) clean
 	cd pppd; $(MAKE) clean
 	cd pppstats; $(MAKE) clean
 	cd pppdump; $(MAKE) clean
@@ -51,5 +58,5 @@ clean:
 dist-clean:	clean
 	rm -f Makefile `find . -name Makefile -print`
 
-kernel:
-	cd linux; ./kinstall.sh
+#kernel:
+#	cd linux; ./kinstall.sh