svn commit: r296644 - head/usr.bin/bmake

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar 11 04:09:50 2016
New Revision: 296644
URL: https://svnweb.freebsd.org/changeset/base/296644

Log:
  Fix upgrade of bmake by not setting conflicting MAKE_VERSION.
  
  This may be used in later checks, such as in bsd.dep.mk, to
  enable features that rely on the built-in value.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/usr.bin/bmake/Makefile

Modified: head/usr.bin/bmake/Makefile
==============================================================================
--- head/usr.bin/bmake/Makefile	Fri Mar 11 04:09:47 2016	(r296643)
+++ head/usr.bin/bmake/Makefile	Fri Mar 11 04:09:50 2016	(r296644)
@@ -17,7 +17,7 @@ CLEANFILES+= bootstrap
 #	$Id: Makefile,v 1.55 2016/03/07 22:02:47 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20160307
+_MAKE_VERSION= 20160307
 
 PROG?=	${.CURDIR:T}
 
@@ -92,7 +92,7 @@ CFLAGS+= ${CPPFLAGS}
 CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
 CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE
 CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
-COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
+COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\""
 
 # meta mode can be useful even without filemon 
 FILEMON_H ?= /usr/include/dev/filemon/filemon.h