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

Reverse the sense of the test wrt bmake, and guard against

Browse Source 
MK_BMAKE not being defined.
This commit is contained in:
Simon J. Gerraty 2013-05-16 21:26:46 +00:00
parent 1b83e8a3f8
commit 4c67ba2c7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -281,7 +281,7 @@ kernel: buildkernel installkernel
# #
upgrade_checks: upgrade_checks:
.if !defined(.PARSEDIR) .if !defined(.PARSEDIR)
.if defined(WITH_BMAKE) .if !defined(WITHOUT_BMAKE)
(cd ${.CURDIR} && ${MAKE} bmake) (cd ${.CURDIR} && ${MAKE} bmake)
.else .else
@if ! (cd ${.CURDIR}/tools/build/make_check && \ @if ! (cd ${.CURDIR}/tools/build/make_check && \

2
usr.bin/make/Makefile
View File

@ -111,7 +111,7 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\"
.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
.endif .endif
.if ${MK_BMAKE} != "no" .if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
# if we are here we don't want this called 'make' # if we are here we don't want this called 'make'
PROG= fmake PROG= fmake
fmake.1: make.1 fmake.1: make.1