Author: sjg
Date: Fri Jun 14 16:25:41 2013
New Revision: 251749
URL: http://svnweb.freebsd.org/changeset/base/251749
Log:
Flag recursive make targets with .MAKE (has no effect on fmake)
make -n will still exectute such targets
make -N will not.
Reviewed by: obrien
Modified:
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Fri Jun 14 16:24:07 2013 (r251748)
+++ head/share/mk/bsd.subdir.mk Fri Jun 14 16:25:41 2013 (r251749)
@@ -36,14 +36,14 @@ __<bsd.subdir.mk>__:
DISTRIBUTION?= base
.if !target(distribute)
-distribute:
+distribute: .MAKE
.for dist in ${DISTRIBUTION}
${_+_}cd ${.CURDIR}; \
${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
.endfor
.endif
-_SUBDIR: .USE
+_SUBDIR: .USE .MAKE
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
@${_+_}set -e; for entry in ${SUBDIR}; do \
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
@@ -60,7 +60,7 @@ _SUBDIR: .USE
done
.endif
-${SUBDIR}: .PHONY
+${SUBDIR}: .PHONY .MAKE
${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \
cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \
else \
@@ -81,7 +81,7 @@ ${__stage}${__target}:
${__stage}${__target}: _SUBDIR
.endif
.endfor
-${__target}:
+${__target}: .MAKE
${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE}
install${__target}
.endfor
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
