diff options
| author | ru <ru@FreeBSD.org> | 2003-07-04 14:27:06 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-07-04 14:27:06 +0000 |
| commit | 240df1e4a76aacc97b23bbdf07b3e37a6c40e152 (patch) | |
| tree | 478c54d6756f6811f22707194bdbd7e463779bb8 /release | |
| parent | 1a28b01e3111666aa59273432a22b76afc30bcf9 (diff) | |
| download | FreeBSD-src-240df1e4a76aacc97b23bbdf07b3e37a6c40e152.zip FreeBSD-src-240df1e4a76aacc97b23bbdf07b3e37a6c40e152.tar.gz | |
Fixed style bugs related to parentheses in Makefile.inc1.
Submitted by: bde
Fixed nearby bug: propagate the root Makefile's idea of
the appropriate "make" binary down to release/Makefile.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile index e52704f..d19cfb9 100644 --- a/release/Makefile +++ b/release/Makefile @@ -65,7 +65,8 @@ TARGET?= ${MACHINE} .else TARGET?= ${TARGET_ARCH} .endif -CROSSMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} +CROSSENV= TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} +CROSSMAKE= ${MAKE} ${CROSSENV} NATIVEMAKE= ${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE} # If you are using a local CVS repository with components stored in @@ -297,8 +298,10 @@ BOOTABLE="-b" DOCREL= doc.1 doc.2 .endif -WMAKEENV!= cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV -WMAKE= ${WMAKEENV} ${MAKE} -m ${.CURDIR}/../share/mk +BINMAKE!= cd ${.CURDIR}/..; ${MAKE} -V BINMAKE +WMAKEENV!= cd ${.CURDIR}/..; \ + ${BINMAKE} ${CROSSENV} -f Makefile.inc1 -V WMAKEENV +WMAKE= ${WMAKEENV} ${BINMAKE} CVS_SRCARGS= -P .if defined(RELEASETAG) @@ -564,8 +567,7 @@ release.5: cd ${j}_crunch; ${WMAKEENV} crunchgen -o ${.CURDIR}/${j}_crunch.conf .endif cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean - cd ${.CURDIR}/..; ${MAKE} -m ${.CURDIR}/../share/mk -f Makefile.inc1 \ - _build-tools + cd ${.CURDIR}/..; ${BINMAKE} _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 |
