diff options
| author | ru <ru@FreeBSD.org> | 2003-07-04 17:35:26 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-07-04 17:35:26 +0000 |
| commit | 1b9c1552b4a154f6ce14d85f2a2bd0e967f92e4c (patch) | |
| tree | 41f8eb71c1efd19aa858d92dcb24f4c11ad34e21 /Makefile | |
| parent | 99f35c432f1f7e2efa75247c4f15bec6e7d83354 (diff) | |
| download | FreeBSD-src-1b9c1552b4a154f6ce14d85f2a2bd0e967f92e4c.zip FreeBSD-src-1b9c1552b4a154f6ce14d85f2a2bd0e967f92e4c.tar.gz | |
Don't hardcore PATH into BINMAKE; the latter should only be
comprised of the path to a make(1) binary (possibly the one
built by the "make" target in this Makefile), and a path to
a fresh share/mk. The idea is to allow "make release" pick
up the right "make" binary, if one exists.
This fixes release.5 I broke with the last commit here; the
second PATH here was overriding the right one from WMAKEENV
while rebuilding the "build-tools" for crunched binaries.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -81,10 +81,10 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} -BINMAKE= PATH=${PATH} \ +BINMAKE= \ `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ -m ${.CURDIR}/share/mk -_MAKE= ${BINMAKE} -f Makefile.inc1 +_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 # # Handle the user-driven targets, using the source relative mk files. |
