X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=solaris%2FMakefile.sol2gcc-64;h=2844a0dbd2f0d5140e7458aea0706a02abac0ac5;hp=f826f1aff3350f56741a2dfc44f103b607b04c05;hb=4043750fca36e7e0eb90d702e048ad1da4929418;hpb=fcec736c6140de7ac8fa9a8fe425932d13b0e45a

diff --git a/solaris/Makefile.sol2gcc-64 b/solaris/Makefile.sol2gcc-64
index f826f1a..2844a0d 100644
--- a/solaris/Makefile.sol2gcc-64
+++ b/solaris/Makefile.sol2gcc-64
@@ -1,7 +1,7 @@
 #
 # Makefile for 64-bit STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2gcc-64,v 1.1 2002/09/07 05:15:25 carlsonj Exp $
+# $Id: Makefile.sol2gcc-64,v 1.3 2004/11/15 00:57:54 carlsonj Exp $
 #
 
 include Makedefs.sol2
@@ -25,15 +25,16 @@ std_objs:
 	$(MAKE) -f $(STD_MAKE) all
 
 ppp:	$(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
-	ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
+	$(LD) -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
 	chmod +x $(LP64DIR)/$@
 
 ppp_ahdl: $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
-	ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
+	$(LD) -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o \
+		$(LP64DIR)/ppp_ahdlc_mod.o
 	chmod +x $(LP64DIR)/$@
 
 ppp_comp: $(COMP_OBJS)
-	ld -r -o $(LP64DIR)/$@ $(COMP_OBJS)
+	$(LD) -r -o $(LP64DIR)/$@ $(COMP_OBJS)
 	chmod +x $(LP64DIR)/$@
 
 $(LP64DIR)/bsd-comp.o: ../modules/bsd-comp.c
@@ -61,6 +62,7 @@ $(LP64DIR):
 	mkdir -m 755 -p $@
 
 install:
+	/usr/sbin/modunload -i 0
 	cp ppp ppp.conf /kernel/drv
 	cp ppp_comp ppp_ahdl /kernel/strmod
 	cp $(LP64DIR)/ppp /kernel/drv/$(LP64DIR)
@@ -68,6 +70,7 @@ install:
 	if grep clone:ppp /etc/minor_perm; then :; else \
 	  echo clone:ppp 0644 root sys >>/etc/minor_perm; fi
 	/usr/sbin/rem_drv ppp 2>/dev/null || true
+	/usr/sbin/modunload -i 0
 	/usr/sbin/add_drv ppp
 
 SRCS	= ppp.c ppp_mod.c ppp_ahdlc.c ppp_ahdlc_mod.c \