leave the real user ID as the user's now

[ppp.git] / svr4 / Makefile.top

diff --git a/svr4/Makefile.top b/svr4/Makefile.top
index 39c413f1249f91b844d5ea04626b65f67f1e296d..0d01d204a6608bde8fa5037c105dc0feaecc1946 100644 (file)
--- a/svr4/Makefile.top
+++ b/svr4/Makefile.top
@@ -1,34 +1,30 @@
 #
-# ppp top level makefile for Solaris 2
+# ppp top level makefile for SVR4 and Solaris 2
+#
+# $Id: Makefile.top,v 1.6 1998/02/04 01:43:23 paulus Exp $
 #
 
-BINDIR = /usr/local/etc
-MANDIR = /usr/local/man
-ETCDIR = /etc/ppp
-
-INSTALL= /usr/sbin/install
+include svr4/Makedefs
 
 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 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
@@ -36,16 +32,16 @@ $(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 *~
        cd chat; $(MAKE) clean
        cd pppd; $(MAKE) clean
        cd pppstats; $(MAKE) clean
-       cd sol2; $(MAKE) clean
+       cd svr4; $(MAKE) clean