diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2003-07-04 17:35:26 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2003-07-04 17:35:26 +0000 |
| commit | ead4296edbd4b6c72c4e0b0cb8d89a0bd82a2477 (patch) | |
| tree | 41f8eb71c1efd19aa858d92dcb24f4c11ad34e21 /Makefile | |
| parent | 83a2d61525b5f916cc21de21887153b400387f6a (diff) | |
| download | src-ead4296edbd4b6c72c4e0b0cb8d89a0bd82a2477.tar.gz src-ead4296edbd4b6c72c4e0b0cb8d89a0bd82a2477.zip | |
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.
Notes
Notes:
svn path=/head/; revision=117234
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. |