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

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 3660c89..616eb98 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,17 +1,18 @@
 # PPP top-level Makefile for Linux.
 
 
-BINDIR = /usr/sbin
-MANDIR = /usr/man
-ETCDIR = /etc/ppp
+BINDIR = $(DESTDIR)/usr/sbin
+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; $(MAKE) $(MFLAGS) all
 	cd pppstats; $(MAKE) $(MFLAGS) all
+	cd pppdump; $(MAKE) $(MFLAGS) all
 
 install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
 
@@ -19,14 +20,13 @@ 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
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
 	$(ETCDIR)/chap-secrets
 
 $(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,12 +40,13 @@ $(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; $(MAKE) clean
 	cd pppstats; $(MAKE) clean
+	cd pppdump; $(MAKE) clean
 
 dist-clean:	clean
 	rm -f Makefile `find . -name Makefile -print`