diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-23 04:03:00 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-23 04:03:00 +0000 |
| commit | b4623773d9081345a7b2168b07a11fffdc248dec (patch) | |
| tree | e7b299ac745187b581b601c035364542d3ec7579 | |
| parent | e6709289f1a6854021fec0ee07ee42bb4a36cb28 (diff) | |
| download | ports-b4623773d9081345a7b2168b07a11fffdc248dec.tar.gz ports-b4623773d9081345a7b2168b07a11fffdc248dec.zip | |
Notes
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | Mk/bsd.commands.mk | 1 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -10,6 +10,13 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20150322: + AUTHOR: bdrewery@FreeBSD.org + + There is now a BSDMAKE that can be overriden for the location of + /usr/bin/make. It is a safer alternative to overriding MAKE_CMD which + will be force reset for gmake/fmake/scons ports. + 20150319: AUTHOR: bdrewery@FreeBSD.org diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 4548490edb61..f1c9b0dad366 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -18,6 +18,7 @@ _COMMANDSMKINCLUDED= yes AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename BRANDELF?= /usr/bin/brandelf +BSDMAKE?= /usr/bin/make BZCAT?= /usr/bin/bzcat BZIP2_CMD?= /usr/bin/bzip2 CAT?= /bin/cat diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 46ecb1e01e8d..e4db350d8987 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2019,7 +2019,7 @@ DISTINFO_FILE?= ${MASTERDIR}/distinfo MAKE_FLAGS?= -f MAKEFILE?= Makefile -MAKE_CMD?= /usr/bin/make +MAKE_CMD?= ${BSDMAKE} MAKE_ENV+= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} \ LIBDIR="${LIBDIR}" \ |