X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=linux%2FMakefile.top;h=f63d45e58a78ab2e275c8dbffbac8469126ed8a4;hb=bb65ff8830596e22d5f6c4c66274ddd726545c85;hp=616eb981374aa5864d7bb22d6a59920889c2a307;hpb=a498b9c66c6daaa18a3d3d5a39a2cd18ba500289;p=ppp.git

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 616eb98..f63d45e 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,30 +1,36 @@
 # PPP top-level Makefile for Linux.
 
-
-BINDIR = $(DESTDIR)/usr/sbin
-MANDIR = $(DESTDIR)/usr/man
-ETCDIR = $(DESTDIR)/etc/ppp
+DESTDIR = $(INSTROOT)@DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+INCDIR = $(DESTDIR)/include
+MANDIR = $(DESTDIR)/share/man
+ETCDIR = $(INSTROOT)@SYSCONF@/ppp
 
 # uid 0 = root
 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-devel
 
 install-progs:
-	cd chat; $(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
+	cd chat; $(MAKE) $(MFLAGS) install
+	cd pppd/plugins; $(MAKE) $(MFLAGS) install
+	cd pppd; $(MAKE) $(MFLAGS) install
+	cd pppstats; $(MAKE) $(MFLAGS) install
+	cd pppdump; $(MAKE) $(MFLAGS) install
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
 	$(ETCDIR)/chap-secrets
 
+install-devel:
+	cd pppd; $(MAKE) $(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,9 @@ clean:
 dist-clean:	clean
 	rm -f Makefile `find . -name Makefile -print`
 
-kernel:
-	cd linux; ./kinstall.sh
+#kernel:
+#	cd linux; ./kinstall.sh
+
+# no tests yet, one day...
+installcheck:
+	true