X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=svr4%2FMakefile.top;h=0d01d204a6608bde8fa5037c105dc0feaecc1946;hp=ac0baa5415039fbef54e6090678366f2027adb28;hb=91fc199e719dbc63e285c677a2d559bf3894bbab;hpb=f8d05a1667af0c81e7c517466d870686afff0a54

diff --git a/svr4/Makefile.top b/svr4/Makefile.top
index ac0baa5..0d01d20 100644
--- a/svr4/Makefile.top
+++ b/svr4/Makefile.top
@@ -1,14 +1,10 @@
 #
-# ppp top level makefile for Solaris 2
+# ppp top level makefile for SVR4 and Solaris 2
 #
-# $Id: Makefile.top,v 1.2 1995/06/01 02:23:09 paulus Exp $
+# $Id: Makefile.top,v 1.6 1998/02/04 01:43:23 paulus Exp $
 #
 
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man
-ETCDIR = /etc/ppp
-
-INSTALL= /usr/sbin/install
+include svr4/Makedefs
 
 all:
 	cd chat; $(MAKE) all
@@ -19,18 +15,16 @@ all:
 install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
 
 install-progs:
-	cd chat; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) install
-	cd pppd; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) install
-	cd pppstats; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) install
-	cd svr4; $(MAKE) BINDIR=$(BINDIR) install
+	cd chat; $(MAKE) install
+	cd pppd; $(MAKE) install
+	cd pppstats; $(MAKE) install
+	cd svr4; $(MAKE) install
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
 	$(ETCDIR)/chap-secrets
 
 $(ETCDIR)/options:
-	if netstat -rn | grep default >/dev/null; then \
-	  cp etc.ppp/options $@; \
-	else cp etc.ppp/options.leaf $@; fi
+	cp etc.ppp/options $@
 	chmod go-w $@
 $(ETCDIR)/pap-secrets:
 	$(INSTALL) -f $(ETCDIR) -m 600 etc.ppp/pap-secrets
@@ -38,11 +32,11 @@ $(ETCDIR)/chap-secrets:
 	$(INSTALL) -f $(ETCDIR) -m 600 etc.ppp/chap-secrets
 
 $(BINDIR):
-	$(INSTALL) -d -m 755 $@
+	mkdir -m 755 -p $@
 $(MANDIR)/man8:
-	$(INSTALL) -d -m 755 $@
+	mkdir -m 755 -p $@
 $(ETCDIR):
-	$(INSTALL) -d -m 755 $@
+	mkdir -m 755 -p $@
 
 clean:
 	rm -f *~