From c7f73c697ff09821c7c9f3ddf61d99bdf1c6925a Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Fri, 19 Jan 2001 09:12:01 +0000 Subject: [PATCH] STABLE10-make-make-dollar-make-20001223 Use $(MAKE) instead of explicitly using make (cherry picked from commit 6103bb18255134ae2ae3a13a8f00cba48ddfa083) --- src/Makefile | 2 +- src/libafs/MakefileProto.SOLARIS | 9 +++++---- src/libafsrpc/Makefile | 4 ++-- src/libuafs/MakefileProto.SOLARIS | 7 ++++--- src/ntp/Makefile | 2 +- src/rcp/Makefile | 6 +++--- src/rlogind/Makefile | 6 +++--- src/rsh/Makefile | 4 ++-- src/sgistuff/Makefile | 4 ++-- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Makefile b/src/Makefile index ac5937b2c..71293bd61 100644 --- 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 666f5ef8f..d6592bcac 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} @@ -106,7 +107,7 @@ ${COMPDIRS}: LIBAFS = libafs.o LIBAFSNONFS = libafs.nonfs.o - + 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 aeaa74797..eec9a2a4e 100644 --- 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 9e36a266d..43875f359 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) diff --git a/src/ntp/Makefile b/src/ntp/Makefile index 5e9fb9542..ff773628f 100644 --- 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 b3903599c..9525c2024 100644 --- 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 4ac2d3578..1b399bf28 100644 --- 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 6717c5bc8..a76f10831 100644 --- 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 51618f763..8ec1c4c98 100644 --- 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 -- 2.39.5