don't use options.leaf any more

[ppp.git] / svr4 / Makefile.top

diff --git a/svr4/Makefile.top b/svr4/Makefile.top
index 39c413f1249f91b844d5ea04626b65f67f1e296d..95a67807939e02165736b1647863caaa73da0cfb 100644 (file)
--- a/svr4/Makefile.top
+++ b/svr4/Makefile.top
@@ -1,8 +1,10 @@
 #
 # ppp top level makefile for Solaris 2
 #
+# $Id: Makefile.top,v 1.3 1996/08/28 06:34:16 paulus Exp $
+#
 
-BINDIR = /usr/local/etc
+BINDIR = /usr/local/bin
 MANDIR = /usr/local/man
 ETCDIR = /etc/ppp
 
@@ -11,24 +13,22 @@ INSTALL= /usr/sbin/install
 all:
        cd chat; $(MAKE) all
        cd pppd; $(MAKE) all
-#      cd pppstats; $(MAKE) all
-       cd sol2; $(MAKE) all
+       cd pppstats; $(MAKE) all
+       cd svr4; $(MAKE) 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 sol2; $(MAKE) BINDIR=$(BINDIR) install
+       cd pppstats; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) install
+       cd svr4; $(MAKE) BINDIR=$(BINDIR) 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
@@ -47,5 +47,5 @@ clean:
        cd chat; $(MAKE) clean
        cd pppd; $(MAKE) clean
        cd pppstats; $(MAKE) clean
-       cd sol2; $(MAKE) clean
+       cd svr4; $(MAKE) clean