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

diff --git a/linux/Makefile.top b/linux/Makefile.top
index c204940..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,6 +20,7 @@ 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
@@ -38,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`