X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=linux%2FMakefile.top;h=fba9bcdad62ff2974b7315a2486cd04cc0dc381f;hb=8dab7e1cb378a55b57a7bca6bc66a7ecc091d41f;hp=3660c89b5f23eaac6c6b537442a550e3548faab7;hpb=6589bd3bbe86761cc41767a1400a69bbc985788a;p=ppp.git

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 3660c89..fba9bcd 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,32 +1,38 @@
 # PPP top-level Makefile for Linux.
 
-
-BINDIR = /usr/sbin
-MANDIR = /usr/man
-ETCDIR = /etc/ppp
+DESTDIR = @DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+INCDIR = $(DESTDIR)/include
+MANDIR = $(DESTDIR)/share/man
+ETCDIR = @SYSCONF@/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-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 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:
-	if netstat -rn | grep default >/dev/null; then \
-	  $(INSTALL) -c -m 644 etc.ppp/options $@; \
-	else $(INSTALL) -c -m 644 etc.ppp/options.leaf $@; fi
+	$(INSTALL) -c -m 644 etc.ppp/options $@
 $(ETCDIR)/pap-secrets:
 	$(INSTALL) -c -m 600 etc.ppp/pap-secrets $@
 $(ETCDIR)/chap-secrets:
@@ -40,15 +46,17 @@ $(ETCDIR):
 	$(INSTALL) -d -m 755 $@
 
 clean:
-	rm -f core `find . -name '*.[oas]' -print`
-	rm -f core `find . -name 'core' -print`
-	rm -f core `find . -name '*~' -print`
+	rm -f `find . -name '*.[oas]' -print`
+	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
 
 dist-clean:	clean
 	rm -f Makefile `find . -name Makefile -print`
 
-kernel:
-	cd linux; ./kinstall.sh
+#kernel:
+#	cd linux; ./kinstall.sh