diff options
| author | sjg <sjg@FreeBSD.org> | 2013-05-16 21:26:46 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-05-16 21:26:46 +0000 |
| commit | 70d21b25e5b391efb14d11a42d5c6c07c0571435 (patch) | |
| tree | 32eead5a0ed629375508cd151062f5688b0874e8 | |
| parent | 1d06cba9f7ba5d8236e7e8617cd610b6b303e631 (diff) | |
| download | FreeBSD-src-70d21b25e5b391efb14d11a42d5c6c07c0571435.zip FreeBSD-src-70d21b25e5b391efb14d11a42d5c6c07c0571435.tar.gz | |
Reverse the sense of the test wrt bmake, and guard against
MK_BMAKE not being defined.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/make/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -281,7 +281,7 @@ kernel: buildkernel installkernel # upgrade_checks: .if !defined(.PARSEDIR) -.if defined(WITH_BMAKE) +.if !defined(WITHOUT_BMAKE) (cd ${.CURDIR} && ${MAKE} bmake) .else @if ! (cd ${.CURDIR}/tools/build/make_check && \ diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 5bc8b87..4605bb3 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -111,7 +111,7 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\" .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." .endif -.if ${MK_BMAKE} != "no" +.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" # if we are here we don't want this called 'make' PROG= fmake fmake.1: make.1 |
