[Midnightbsd-cvs] src [9620] trunk/share/mk/bsd.subdir.mk: sync up with freebsd 9 stable/ 10.0 release

[laffer1 at midnightbsd.org]

Revision: 9620
          http://svnweb.midnightbsd.org/src/?rev=9620
Author:   laffer1
Date:     2017-10-06 10:33:08 -0400 (Fri, 06 Oct 2017)
Log Message:
-----------
sync up with freebsd 9 stable/ 10.0 release

Modified Paths:
--------------
    trunk/share/mk/bsd.subdir.mk

Modified: trunk/share/mk/bsd.subdir.mk
===================================================================
--- trunk/share/mk/bsd.subdir.mk	2017-10-05 15:22:47 UTC (rev 9619)
+++ trunk/share/mk/bsd.subdir.mk	2017-10-06 14:33:08 UTC (rev 9620)
@@ -30,11 +30,14 @@
 #	maninstall, manlint, obj, objlink, realinstall, regress, tags
 #
 
+.if !target(__<bsd.subdir.mk>__)
+__<bsd.subdir.mk>__:
+
 .include <bsd.init.mk>
 
 DISTRIBUTION?=	base
 .if !target(distribute)
-distribute:
+distribute: .MAKE
 .for dist in ${DISTRIBUTION}
 	${_+_}cd ${.CURDIR}; \
 	    ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
@@ -41,7 +44,7 @@
 .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 \
@@ -58,7 +61,7 @@
 	done
 .endif
 
-${SUBDIR}: .PHONY
+${SUBDIR}: .PHONY .MAKE
 	${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \
 		cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \
 	else \
@@ -98,7 +101,7 @@
 ${__stage}${__target}: _SUBDIR
 .endif
 .endfor
-${__target}:
+${__target}: .MAKE
 	${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target}
 .endfor
 
@@ -112,3 +115,5 @@
 install: beforeinstall realinstall afterinstall
 .ORDER: beforeinstall realinstall afterinstall
 .endif
+
+.endif