PERFORCE change 130616 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=130616

Change 130616 by imp at imp_mbp on 2007/12/11 07:10:43

	Don't assume make is a bsdmake.  It isn't on Darwin/OS X.

Affected files ...

.. //depot/projects/arm/src/Makefile#13 edit

Differences ...

==== //depot/projects/arm/src/Makefile#13 (text+ko) ====

@@ -113,6 +113,7 @@
 	(in make.conf(5)) or command-line variable.
 .endif
 MAKEPATH=	${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
+BSDMAKE?=make
 BINMAKE= \
 	`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
 	-m ${.CURDIR}/share/mk
@@ -236,7 +237,7 @@
 	    PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
 	    PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
 	then \
-	    (cd ${.CURDIR} && make make); \
+	    (cd ${.CURDIR} && ${BSDMAKE} make); \
 	fi
 
 #
@@ -245,8 +246,9 @@
 #
 MMAKEENV=	MAKEOBJDIRPREFIX=${MAKEPATH} \
 		DESTDIR= \
+		LIBC= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
-MMAKE=		${MMAKEENV} make \
+MMAKE=		${MMAKEENV} ${BSDMAKE} \
 		-D_UPGRADING \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR