summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2003-07-04 14:27:06 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2003-07-04 14:27:06 +0000
commit5dc6311712e646a85f63f99a8c3000d1a0dd0142 (patch)
tree478c54d6756f6811f22707194bdbd7e463779bb8 /Makefile
parent4f933468718174f76242d2eedcbb628a4ab83ca8 (diff)
downloadsrc-test-5dc6311712e646a85f63f99a8c3000d1a0dd0142.tar.gz
src-test-5dc6311712e646a85f63f99a8c3000d1a0dd0142.zip
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.
Notes
Notes: svn path=/head/; revision=117229
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6334f635927c4..d70f89b65935b 100644
--- a/Makefile
+++ b/Makefile
@@ -81,9 +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}
-_MAKE= PATH=${PATH} \
+BINMAKE= PATH=${PATH} \
`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.