From owner-svn-src-all@FreeBSD.ORG  Thu May 16 21:26:47 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 29ED5462;
 Thu, 16 May 2013 21:26:47 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1C6BD7F4;
 Thu, 16 May 2013 21:26:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GLQkvj021292;
 Thu, 16 May 2013 21:26:47 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GLQk8Q021290;
 Thu, 16 May 2013 21:26:46 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201305162126.r4GLQk8Q021290@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 16 May 2013 21:26:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250719 - in head: . usr.bin/make
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 21:26:47 -0000

Author: sjg
Date: Thu May 16 21:26:46 2013
New Revision: 250719
URL: http://svnweb.freebsd.org/changeset/base/250719

Log:
  Reverse the sense of the test wrt bmake, and guard against
  MK_BMAKE not being defined.

Modified:
  head/Makefile
  head/usr.bin/make/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Thu May 16 21:04:56 2013	(r250718)
+++ head/Makefile	Thu May 16 21:26:46 2013	(r250719)
@@ -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 && \

Modified: head/usr.bin/make/Makefile
==============================================================================
--- head/usr.bin/make/Makefile	Thu May 16 21:04:56 2013	(r250718)
+++ head/usr.bin/make/Makefile	Thu May 16 21:26:46 2013	(r250719)
@@ -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