Date: Thu, 16 May 2013 21:26:46 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250719 - in head: . usr.bin/make Message-ID: <201305162126.r4GLQk8Q021290@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305162126.r4GLQk8Q021290>