d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed style bugs related to parentheses in Makefile.inc1.

Browse Source 
Submitted by:	bde

Fixed nearby bug: propagate the root Makefile's idea of
the appropriate "make" binary down to release/Makefile.
This commit is contained in:
Ruslan Ermilov 2003-07-04 14:27:06 +00:00
parent 4f93346871
commit 5dc6311712
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -81,9 +81,10 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
PATH= /sbin:/bin:/usr/sbin:/usr/bin PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj MAKEOBJDIRPREFIX?= /usr/obj
MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
_MAKE= PATH=${PATH} \ BINMAKE= PATH=${PATH} \
`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
-m ${.CURDIR}/share/mk -f Makefile.inc1 -m ${.CURDIR}/share/mk
_MAKE= ${BINMAKE} -f Makefile.inc1
# #
# Handle the user-driven targets, using the source relative mk files. # Handle the user-driven targets, using the source relative mk files.

12
Makefile.inc1
View File

@ -652,18 +652,18 @@ _groff= gnu/usr.bin/groff/tmac
.endif .endif
.endif .endif
.if ( ${BOOTSTRAPPING} < 450005 || \ .if ${BOOTSTRAPPING} < 450005 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 )) ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034
_uudecode= usr.bin/uudecode _uudecode= usr.bin/uudecode
.endif .endif
.if ( ${BOOTSTRAPPING} < 430002 || \ .if ${BOOTSTRAPPING} < 430002 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500019 )) ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500019
_xargs= usr.bin/xargs _xargs= usr.bin/xargs
.endif .endif
.if ( ${BOOTSTRAPPING} < 430002 || \ .if ${BOOTSTRAPPING} < 430002 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500018 )) ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500018
_yacc= usr.bin/yacc _yacc= usr.bin/yacc
.endif .endif

12
release/Makefile
View File

@ -65,7 +65,8 @@ TARGET?= ${MACHINE}
.else .else
TARGET?= ${TARGET_ARCH} TARGET?= ${TARGET_ARCH}
.endif .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} NATIVEMAKE= ${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE}
# If you are using a local CVS repository with components stored in # If you are using a local CVS repository with components stored in
@ -297,8 +298,10 @@ BOOTABLE="-b"
DOCREL= doc.1 doc.2 DOCREL= doc.1 doc.2
.endif .endif
WMAKEENV!= cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV BINMAKE!= cd ${.CURDIR}/..; ${MAKE} -V BINMAKE
WMAKE= ${WMAKEENV} ${MAKE} -m ${.CURDIR}/../share/mk WMAKEENV!= cd ${.CURDIR}/..; \
${BINMAKE} ${CROSSENV} -f Makefile.inc1 -V WMAKEENV
WMAKE= ${WMAKEENV} ${BINMAKE}
CVS_SRCARGS= -P CVS_SRCARGS= -P
.if defined(RELEASETAG) .if defined(RELEASETAG)
@ -564,8 +567,7 @@ release.5:
cd ${j}_crunch; ${WMAKEENV} crunchgen -o ${.CURDIR}/${j}_crunch.conf cd ${j}_crunch; ${WMAKEENV} crunchgen -o ${.CURDIR}/${j}_crunch.conf
.endif .endif
cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
cd ${.CURDIR}/..; ${MAKE} -m ${.CURDIR}/../share/mk -f Makefile.inc1 \ cd ${.CURDIR}/..; ${BINMAKE} _build-tools
_build-tools
cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk \ cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk \
CFLAGS="-Os -pipe" -DNO_CPU_CFLAGS all CFLAGS="-Os -pipe" -DNO_CPU_CFLAGS all
${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch ${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch