From: Paul Mackerras <paulus@samba.org>
Date: Wed, 28 Aug 1996 06:34:16 +0000 (+0000)
Subject: don't use options.leaf any more
X-Git-Tag: RELEASE_2_3_6~375
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=e5ad7e3dbf232955054ee90e54cebd6ee9533a85

don't use options.leaf any more
---

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 3660c89..c204940 100644
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -24,9 +24,7 @@ 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:
diff --git a/sunos4/Makefile.top b/sunos4/Makefile.top
index b63276c..c24e057 100644
--- a/sunos4/Makefile.top
+++ b/sunos4/Makefile.top
@@ -26,9 +26,7 @@ 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:
diff --git a/svr4/Makefile.top b/svr4/Makefile.top
index ac0baa5..95a6780 100644
--- a/svr4/Makefile.top
+++ b/svr4/Makefile.top
@@ -1,7 +1,7 @@
 #
 # ppp top level makefile for Solaris 2
 #
-# $Id: Makefile.top,v 1.2 1995/06/01 02:23:09 paulus Exp $
+# $Id: Makefile.top,v 1.3 1996/08/28 06:34:16 paulus Exp $
 #
 
 BINDIR = /usr/local/bin
@@ -28,9 +28,7 @@ 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