aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2007-12-13 00:08:02 +0000
committerWarner Losh <imp@FreeBSD.org>2007-12-13 00:08:02 +0000
commite2be0fd00d415ac4398ecc2ea6ba50d2ef7c3225 (patch)
tree0f0ab7bce43170558ac0881cc48c2536049260db /Makefile
parent9768c3fea8595ba4d030b320367a2e6b13c4d245 (diff)
downloadsrc-e2be0fd00d415ac4398ecc2ea6ba50d2ef7c3225.tar.gz
src-e2be0fd00d415ac4398ecc2ea6ba50d2ef7c3225.zip
We don't need to invent BSDMAKE. ${MAKE} is sufficient.
Submitted by: jmallet@
Notes
Notes: svn path=/head/; revision=174564
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 25da88164020..3480c2265b45 100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,7 @@ upgrade_checks:
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
- (cd ${.CURDIR} && ${BSDMAKE} make); \
+ (cd ${.CURDIR} && ${MAKE} make); \
fi
#
@@ -242,11 +242,10 @@ upgrade_checks:
# 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} ${BSDMAKE} \
+MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR