svn commit: r291791 - stable/10/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Dec  4 18:09:51 2015
New Revision: 291791
URL: https://svnweb.freebsd.org/changeset/base/291791

Log:
  MFC r289669:
  
    Fix building in a directory with SUBDIRs and SUBDIR_PARALLEL.

Modified:
  stable/10/share/mk/bsd.progs.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.progs.mk
==============================================================================
--- stable/10/share/mk/bsd.progs.mk	Fri Dec  4 18:07:44 2015	(r291790)
+++ stable/10/share/mk/bsd.progs.mk	Fri Dec  4 18:09:51 2015	(r291791)
@@ -125,16 +125,18 @@ x.$p= PROG_CXX=$p
 
 # Main PROG target
 $p ${p}_p: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p \
+	(cd ${.CURDIR} && \
+	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
+	    PROG=$p \
 	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
 	    ${x.$p})
 
 # Pseudo targets for PROG, such as 'install'.
 .for t in ${PROGS_TARGETS:O:u}
 $p.$t: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p \
+	(cd ${.CURDIR} && \
+	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
+	    PROG=$p \
 	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
 	    ${x.$p} ${@:E})
 .endfor