d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We don't need to invent BSDMAKE. ${MAKE} is sufficient.

Browse Source 
Submitted by: jmallet@
This commit is contained in:
Warner Losh 2007-12-13 00:08:02 +00:00
parent 9768c3fea8
commit e2be0fd00d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -234,7 +234,7 @@ upgrade_checks:
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \ then \
(cd ${.CURDIR} && ${BSDMAKE} make); \ (cd ${.CURDIR} && ${MAKE} make); \
fi fi
# #
@ -242,11 +242,10 @@ upgrade_checks:
# headers, libraries and tools. Also, allow the location of # headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden. # the system bsdmake-like utility to be overridden.
# #
BSDMAKE?=make
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \ DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh" INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} ${BSDMAKE} \ MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \ -D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR -DNO_CPU_CFLAGS -DNO_WERROR