summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2007-12-11 20:00:55 +0000
committerWarner Losh <imp@FreeBSD.org>2007-12-11 20:00:55 +0000
commit6029ad99329a4a86b459374d8cbde64e0791d022 (patch)
treeb66dc99a970edd3dcb00c878a9e7fb2b3006dfa8 /Makefile
parenta8a27cb0f9cff2ac38416c54e7a3a50e48c078a9 (diff)
downloadsrc-test2-6029ad99329a4a86b459374d8cbde64e0791d022.tar.gz
src-test2-6029ad99329a4a86b459374d8cbde64e0791d022.zip
Notes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 77d68e52d62f..25da88164020 100644
--- a/Makefile
+++ b/Makefile
@@ -234,17 +234,19 @@ upgrade_checks:
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
#
# Upgrade make(1) to the current version using the installed
-# headers, libraries and tools.
+# headers, libraries and tools. Also, allow the location of
+# the system bsdmake-like utility to be overridden.
#
+BSDMAKE?=make
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \
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