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.
This commit is contained in:
Ruslan Ermilov 2003-07-04 17:35:26 +00:00
parent 83a2d61525
commit ead4296edb

View File

@ -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.