From f0e9b38d901f7b5f89a9625f9e3ae79ec4fb14c9 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 14 Jun 2013 16:25:41 +0000
Subject: 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
---
 share/mk/bsd.subdir.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'share/mk/bsd.subdir.mk')

diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 3d5fb61..12dd4de 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -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
 
-- 
cgit v1.1