From 4c67ba2c7bb3c38f11bed3777735a3adc34df04c Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 16 May 2013 21:26:46 +0000
Subject: [PATCH] Reverse the sense of the test wrt bmake, and guard against
 MK_BMAKE not being defined.

---
 Makefile              | 2 +-
 usr.bin/make/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a396fc9c167c..7058ffddbbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -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 5bc8b87a7bed..4605bb39ab11 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