2c2
< # $FreeBSD: head/Makefile 253003 2013-07-07 20:44:04Z alfred $
---
> # $FreeBSD: head/Makefile 253616 2013-07-24 17:55:08Z sjg $
133,135c133,154
< MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
< BINMAKE= \
< `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
---
>
> # We often need to use the tree's version of make to build it.
> # Choices add to complexity though.
> # We cannot blindly use a make which may not be the one we want
> # so be exlicit - until all choice is removed.
> .if !defined(WITHOUT_BMAKE)
> WANT_MAKE= bmake
> .else
> WANT_MAKE= fmake
> .endif
> MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
> .if defined(.PARSEDIR)
> HAVE_MAKE= bmake
> .else
> HAVE_MAKE= fmake
> .endif
> .if exists(${MYMAKE})
> SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
> .elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake"
> # It may not exist yet but we may cause it to.
> # In the case of fmake, upgrade_checks may cause a newer version to be built.
> SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
137c156,158
< _MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
---
> .else
> SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
> .endif
138a160,161
> _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
>
293a317,319
> # Note: if we ever need to care about the version of bmake, simply testing
> # MAKE_VERSION against a required version should suffice.
> #
295,298c321,323
< .if !defined(.PARSEDIR)
< .if !defined(WITHOUT_BMAKE)
< (cd ${.CURDIR} && ${MAKE} bmake)
< .else
---
> .if ${HAVE_MAKE} != ${WANT_MAKE}
> @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
> .elif ${WANT_MAKE} == "fmake"
306d330
< .endif
313c337
< MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
---
> MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
330c354
< ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
---
> ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T}
380c404,405
< universe: universe_prologue upgrade_checks
---
> universe_prologue: upgrade_checks
> universe: universe_prologue
390c415
< .ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue
---
> universe_epilogue: universe_${target}
392c417
< universe_${target}_prologue:
---
> universe_${target}_prologue: universe_prologue
400c425
< ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
---
> ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
421c446
< ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
---
> ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
425c450
< @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
---
> @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
448c473
< ${MAKE} ${JFLAG} buildkernel \
---
> ${SUB_MAKE} ${JFLAG} buildkernel \