diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-11 04:09:50 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-11 04:09:50 +0000 |
| commit | 80a5408c49c30cf699c08899bda0e038db9928d4 (patch) | |
| tree | 838da1d7bf76bed138b13175ee9bd63d1a91ba78 /usr.bin | |
| parent | 125297980a0815c909a524e318fa5c6c387de271 (diff) | |
| download | src-80a5408c49c30cf699c08899bda0e038db9928d4.tar.gz src-80a5408c49c30cf699c08899bda0e038db9928d4.zip | |
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
Notes
Notes:
svn path=/head/; revision=296644
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bmake/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 3981c294c44c..b3291edb7e90 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -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 |