Use Makedefs.com rather than solaris/Makedefs, since Makedefs.com

has @DESTDIR@ etc. substituted.
Move installation of kernel modules to a install-modules target
so that it can be compiled and installed in an alternate directory
as non-root for the build farm.

diff --git a/solaris/Makefile.top b/solaris/Makefile.top
index 264406b6faf705c5f9e17dda402e74d4dc9dcbcb..73edccd326ab8d21848c9b38c768ae8c52db0d4d 100644 (file)
--- a/solaris/Makefile.top
+++ b/solaris/Makefile.top
@@ -1,10 +1,10 @@
 #
 # ppp top level makefile for SVR4 and Solaris 2
 #
-# $Id: Makefile.top,v 1.2 2004/10/31 22:26:25 paulus Exp $
+# $Id: Makefile.top,v 1.3 2004/11/01 09:31:07 paulus Exp $
 #
 
-include solaris/Makedefs
+include Makedefs.com
 
 all:
        cd chat; $(MAKE) all
@@ -13,18 +13,20 @@ all:
        cd pppdump; $(MAKE) all
        cd solaris; $(MAKE) all
 
-install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
+install: $(BINDIR) $(MANDIR)/man8 install-progs
 
 install-progs:
        cd chat; $(MAKE) install
        cd pppd; $(MAKE) install
        cd pppstats; $(MAKE) install
        cd pppdump; $(MAKE) install
-       cd solaris; $(MAKE) install
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
        $(ETCDIR)/chap-secrets
 
+install-modules:
+       cd solaris; $(MAKE) install
+
 $(ETCDIR)/options:
        cp etc.ppp/options $@
        chmod go-w $@