This appears to fix some of the gmake issues I was having on solaris.
Most of the source already uses $(MAKE), this changes the few remaining
instances where 'make' is called directly to use $(MAKE) instead.
-- Nathan
------------------------------------------------------------
Nathan Neulinger EMail: [EMAIL PROTECTED]
University of Missouri - Rolla Phone: (573) 341-4841
Computing Services Fax: (573) 341-4216
Index: Makefile
===================================================================
RCS file: /cvs/openafs/src/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 2000/12/01 22:36:53 1.4
+++ Makefile 2000/12/21 17:06:45
@@ -12,7 +12,7 @@
WASHTOOL=${SRCDIR}bin/washtool
#WASHTOOLRCSUPDATE=${WASHTOOL} rcsupdate
-WASHTOOLCMD=make
+WASHTOOLCMD=$(MAKE)
WASHTOOLFLAGS=-argument install
COMPILE_PART1=${WASHTOOL} ${WASHTOOLCMD}
Index: libafsrpc/Makefile
===================================================================
RCS file: /cvs/openafs/src/libafsrpc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- libafsrpc/Makefile 2000/11/04 10:05:05 1.2
+++ libafsrpc/Makefile 2000/12/21 17:06:51
@@ -109,9 +109,9 @@
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
Index: ntp/Makefile
===================================================================
RCS file: /cvs/openafs/src/ntp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ntp/Makefile 2000/11/04 10:05:14 1.2
+++ ntp/Makefile 2000/12/21 17:06:51
@@ -146,10 +146,10 @@
#
# If you don't want a symlink to the daemon, comment out the next line
-# make ${MFLAGS} DESTDIR=${DESTDIR} install-link
+# $(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
Index: rcp/Makefile
===================================================================
RCS file: /cvs/openafs/src/rcp/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- rcp/Makefile 2000/11/04 02:28:49 1.1
+++ rcp/Makefile 2000/12/21 17:06:51
@@ -54,13 +54,13 @@
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:
Index: rlogind/Makefile
===================================================================
RCS file: /cvs/openafs/src/rlogind/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- rlogind/Makefile 2000/11/04 02:28:50 1.1
+++ rlogind/Makefile 2000/12/21 17:06:51
@@ -66,13 +66,13 @@
../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
Index: rsh/Makefile
===================================================================
RCS file: /cvs/openafs/src/rsh/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- rsh/Makefile 2000/11/04 02:28:51 1.1
+++ rsh/Makefile 2000/12/21 17:06:51
@@ -52,9 +52,9 @@
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
Index: sgistuff/Makefile
===================================================================
RCS file: /cvs/openafs/src/sgistuff/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sgistuff/Makefile 2000/11/04 10:05:47 1.2
+++ sgistuff/Makefile 2000/12/21 17:06:51
@@ -48,10 +48,10 @@
$(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
