svn commit: r291750 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Dec  4 07:54:16 2015
New Revision: 291750
URL: https://svnweb.freebsd.org/changeset/base/291750

Log:
  The .if redirection on .WAIT is no longer needed with bmake.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.subdir.mk

Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk	Fri Dec  4 07:54:13 2015	(r291749)
+++ head/share/mk/bsd.subdir.mk	Fri Dec  4 07:54:16 2015	(r291750)
@@ -113,8 +113,6 @@ ${SUBDIR:N.WAIT}: .PHONY .MAKE
 	    dir=${.TARGET}; \
 	    ${_SUBDIR_SH};
 
-# Work around parsing of .if nested in .for by putting .WAIT string into a var.
-__wait= .WAIT
 .for __target in ${ALL_SUBDIR_TARGETS}
 # Only recurse on directly-called targets.  I.e., don't recurse on dependencies
 # such as 'install' becoming {before,real,after}install, just recurse
@@ -131,7 +129,7 @@ _is_standalone_target=	0
 .if defined(SUBDIR_PARALLEL) || ${_is_standalone_target} == 1
 __subdir_targets=
 .for __dir in ${SUBDIR}
-.if ${__wait} == ${__dir}
+.if ${__dir} == .WAIT
 __subdir_targets+= .WAIT
 .else
 __subdir_targets+= ${__target}_subdir_${__dir}