diff options
| author | ru <ru@FreeBSD.org> | 2003-04-15 06:36:38 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-04-15 06:36:38 +0000 |
| commit | e7e7ff6c1cee7cfcbfd15e9651917287a315e054 (patch) | |
| tree | b654e705745469d544baf0f6673ea4f295217f68 | |
| parent | f6ae17d57c44b163fe0367205dedeef274e90aa6 (diff) | |
| download | FreeBSD-src-e7e7ff6c1cee7cfcbfd15e9651917287a315e054.zip FreeBSD-src-e7e7ff6c1cee7cfcbfd15e9651917287a315e054.tar.gz | |
Makefile.inc1 rev. 1.341 broke release.5 -- the fuss with MAKEFLAGS
here interferenced with one in Makefile.inc1. Since we can't avoid
the jugglery in Makefile.inc1 (we want -m /usr/src/tools/build/mk
to come first, before any other -m specified on the command line),
avoid it here.
Reported by: imp
| -rw-r--r-- | release/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 6cbe3ff..96b90de 100644 --- a/release/Makefile +++ b/release/Makefile @@ -287,8 +287,6 @@ BOOTABLE="-b" DOCREL= doc.1 doc.2 .endif -TMAKE!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \ - cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE WMAKEENV!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \ cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV WMAKE= ${WMAKEENV} ${MAKE} @@ -564,7 +562,8 @@ release.5: cd ${j}_crunch; ${WMAKEENV} crunchgen -o ${.CURDIR}/${j}_crunch.conf .endif cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean - cd ${.CURDIR}/..; ${TMAKE} build-tools + cd ${.CURDIR}/..; ${MAKE} -m ${.CURDIR}/../share/mk -f Makefile.inc1 \ + _build-tools cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk \ CFLAGS="-Os -pipe" -DNO_CPU_CFLAGS all ${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch |
