STABLE10-make-make-dollar-make-20001223

Use $(MAKE) instead of explicitly using make

(cherry picked from commit 6103bb18255134ae2ae3a13a8f00cba48ddfa083)

diff --git a/src/Makefile b/src/Makefile
index ac5937b2c83af1b5b8914525852eff15b67de19b..71293bd615dba90cc14f9928d16cf5a977475d23 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ INSTALL=${SRCDIR}bin/install
 WASHTOOL=${SRCDIR}bin/washtool
 
 #WASHTOOLRCSUPDATE=${WASHTOOL} rcsupdate
-WASHTOOLCMD=make
+WASHTOOLCMD=$(MAKE)
 WASHTOOLFLAGS=-argument install
 
 COMPILE_PART1=${WASHTOOL} ${WASHTOOLCMD}

diff --git a/src/libafs/MakefileProto.SOLARIS b/src/libafs/MakefileProto.SOLARIS
index 666f5ef8f1e698df03d4bba6c1ebc1eeaf66f55d..d6592bcac6e4d05a2c02a13f4f838c8afeb0ce8f 100644 (file)
--- 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}
 
@@ -106,7 +107,7 @@ ${COMPDIRS}:
 LIBAFS = libafs.o
 LIBAFSNONFS = libafs.nonfs.o
 
-<all -sun4x_57 sun4x_58>
+<all -sun4x_57 -sun4x_58>
 DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS}
 DEST_LIBAFSNONFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFSNONFS}
 

diff --git a/src/libafsrpc/Makefile b/src/libafsrpc/Makefile
index aeaa7479756e1ef8d09656574b14fe911d7fca6c..eec9a2a4e56df6efe043bd7d8db020cedb7abb3b 100644 (file)
--- a/src/libafsrpc/Makefile
+++ b/src/libafsrpc/Makefile
@@ -109,9 +109,9 @@ LIBOBJS = \
 
 system install:
        if [ -f "../des/Makefile" ] ; then \
-               make install.lib ; \
+               $(MAKE) install.lib ; \
        else \
-               make libstub ; \
+               $(MAKE) libstub ; \
        fi
 
 install.lib: ${DESTDIR}lib/libafsrpc.a

diff --git a/src/libuafs/MakefileProto.SOLARIS b/src/libuafs/MakefileProto.SOLARIS
index 9e36a266d2c4df8f4c6e20b6de248cd40350c579..43875f359fc864d47d5d0acf4d4fc29edc207b72 100644 (file)
--- 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)

diff --git a/src/ntp/Makefile b/src/ntp/Makefile
index 5e9fb9542b61fcb020a979c97836655ee31bb9b9..ff773628f1fdd863d6a05f1cc16fd16d1c65c483 100644 (file)
--- a/src/ntp/Makefile
+++ b/src/ntp/Makefile
@@ -149,7 +149,7 @@ install: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp
 #      make ${MFLAGS} DESTDIR=${DESTDIR} install-link
 
 install-man:
-       cd man; make ${MFLAGS} DESTDIR=${DESTDIR} install
+       cd man; $(MAKE) ${MFLAGS} DESTDIR=${DESTDIR} install
 
 install-link:
        rm -f ${BINDIR}/${LINKDIR}/ntpd

diff --git a/src/rcp/Makefile b/src/rcp/Makefile
index b3903599cf970419d81fbbc9bf315e706c8215fa..9525c2024180c5093c3d289c527d47b28f09d0a5 100644 (file)
--- a/src/rcp/Makefile
+++ b/src/rcp/Makefile
@@ -54,13 +54,13 @@ rcp: ${OBJS} ${LIBS}
         esac
 
 ../rsh/rcmd.o: ../rsh/rcmd.c
-       (cd ../rsh ; make rcmd.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
+       (cd ../rsh ; $(MAKE) rcmd.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
 
 ../rsh/herror.o: ../rsh/herror.c
-       (cd ../rsh ; make herror.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
+       (cd ../rsh ; $(MAKE) herror.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
 
 ../inetd/ta-rauth.o: ../inetd/ta-rauth.c
-       (cd ../inetd ; make ta-rauth.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
+       (cd ../inetd ; $(MAKE) ta-rauth.o SRCDIR=${SRCDIR} DESTDIR=${DESTDIR})
 
 clean:
 clean:

diff --git a/src/rlogind/Makefile b/src/rlogind/Makefile
index 4ac2d35786ca0a487ca3c0cf698c1107f04b7f95..1b399bf2883f584abb852200f51e157af53a9ef4 100644 (file)
--- a/src/rlogind/Makefile
+++ b/src/rlogind/Makefile
@@ -66,13 +66,13 @@ rexecd: rexecd.o ${ALIBS}
 
 
 ../login/libutil.a : ../login/util_login.c ../login/util_logout.c ../login/util_logwtmp.c
-       ( cd ../login ; make libutil.a )
+       ( cd ../login ; $(MAKE) libutil.a )
 
 ../rsh/rcmd.o : ../rsh/rcmd.c
-       (cp AFS_component_version_number.c ../rsh/AFS_component_version_number.c ;  cd ../rsh ; make rsh.o )
+       (cp AFS_component_version_number.c ../rsh/AFS_component_version_number.c ;  cd ../rsh ; $(MAKE) rsh.o )
 
 ../rsh/herror.o : ../rsh/herror.c
-       ( cd ../rsh ; make herror.o )
+       ( cd ../rsh ; $(MAKE) herror.o )
 
 clean:
        rm -f ${OBJS} core rlogind AFS_component_version_number.c

diff --git a/src/rsh/Makefile b/src/rsh/Makefile
index 6717c5bc8e86314bbd7e55c4bd73a308b293e461..a76f1083161f3078e1f5a0f785a88a862e5ea2a5 100644 (file)
--- a/src/rsh/Makefile
+++ b/src/rsh/Makefile
@@ -52,9 +52,9 @@ rlogin.o: rlogin.c AFS_component_version_number.c
 rsh.o: rsh.c AFS_component_version_number.c
 
 ../rlogind/herror.o: ../rlogind/herror.c
-       (cd ../rlogind ; make herror.o )
+       (cd ../rlogind ; $(MAKE) herror.o )
 ../inetd/ta-rauth.o : ../inetd/ta-rauth.c
-       (cd ../inetd ; make ta-rauth.o DESTDIR=${DESTDIR})
+       (cd ../inetd ; $(MAKE) ta-rauth.o DESTDIR=${DESTDIR})
 
 clean:
        rm -f ${OBJS} core rsh *.BAK AFS_component_version_number.c

diff --git a/src/sgistuff/Makefile b/src/sgistuff/Makefile
index 51618f7631635229d635f0a592bceb42bd20e6f1..8ec1c4c98046561563b2f74cc9f2672dc2972794 100644 (file)
--- a/src/sgistuff/Makefile
+++ b/src/sgistuff/Makefile
@@ -48,10 +48,10 @@ afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES}
        $(LD) ${LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES}
 
 ../rsh/rcmd.o: ../rsh/rcmd.c
-       (cd ../rsh ; make rcmd.o )
+       (cd ../rsh ; $(MAKE) rcmd.o )
 
 ../rsh/herror.o: ../rsh/herror.c
-       (cd ../rsh ; make herror.o )
+       (cd ../rsh ; $(MAKE) herror.o )
 
 sgi_auth.o: sgi_auth.c
        ${CC} ${CFLAGS} -c sgi_auth.c