From 36f72fa1144e818642d3fc9d65f9e1021b83aaac Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Tue, 19 Dec 2000 07:34:34 +0000
Subject: [PATCH] solaris-make-cleanup-20001219

Remove redundancy in Solaris Makefile Protos
---
 src/libafs/MakefileProto.SOLARIS  | 7 ++++---
 src/libuafs/MakefileProto.SOLARIS | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/libafs/MakefileProto.SOLARIS b/src/libafs/MakefileProto.SOLARIS
index 666f5ef8f1..283dff6a08 100644
--- a/src/libafs/MakefileProto.SOLARIS
+++ b/src/libafs/MakefileProto.SOLARIS
@@ -28,9 +28,10 @@ AFS_OS_NONFSOBJS = \
 
 # System specific build commands and flags
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
-LD = /usr/ccs/bin/ld
-LORDER = /usr/ccs/bin/lorder
-CC = /opt/SUNWspro/bin/cc
+#These are redundant
+#LD = /usr/ccs/bin/ld
+#LORDER = /usr/ccs/bin/lorder
+#CC = /opt/SUNWspro/bin/cc
 KDEFS= -Dsun4c -DSUN4C_60 -DNFSCLIENT -DSYSACCT -DOLDSCSI -DVDDRV -D_KERNEL \
 	-DSYSV -dn ${ARCH_DEFS}
 
diff --git a/src/libuafs/MakefileProto.SOLARIS b/src/libuafs/MakefileProto.SOLARIS
index 9e36a266d2..43875f359f 100644
--- a/src/libuafs/MakefileProto.SOLARIS
+++ b/src/libuafs/MakefileProto.SOLARIS
@@ -13,7 +13,8 @@ include $(DESTDIR)../obj/config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 # System specific build commands and flags
-CC = /opt/SUNWspro/bin/cc
+# Redundant
+# CC = /opt/SUNWspro/bin/cc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
 CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
@@ -73,9 +74,9 @@ $(LIBUAFS): $(UAFSOBJ)
 
 $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
 	-rm -f $(LIBAFSWEB)
-	ld -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+	${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
 
 
 $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
 	-rm -f $(LIBAFSWEBKRB)
-	ld -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
+	${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)