svn commit: r290126 - head/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Thu Oct 29 00:41:05 UTC 2015


Author: bdrewery
Date: Thu Oct 29 00:41:03 2015
New Revision: 290126
URL: https://svnweb.freebsd.org/changeset/base/290126

Log:
  Fix regression from using .USEBEFORE in _SUBDIR in r289705.
  
  Using .USEBEFORE had the unintended side-effect of changing the directory for
  the real target ran in the current directory.  For example this meant that
  the 'make clean' would run in one of the SUBDIR.
  
  Sponsored by:	EMC / Isilon Storage Division
  Pointyhat to:	bdrewery

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

Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk	Thu Oct 29 00:36:10 2015	(r290125)
+++ head/share/mk/bsd.subdir.mk	Thu Oct 29 00:41:03 2015	(r290126)
@@ -83,7 +83,7 @@ _SUBDIR_SH=	\
 _SUBDIR: .USEBEFORE
 .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
 	@${_+_}target=${.TARGET:S,realinstall,install,}; \
-	    for dir in ${SUBDIR:N.WAIT}; do ${_SUBDIR_SH}; done
+	    for dir in ${SUBDIR:N.WAIT}; do ( ${_SUBDIR_SH} ); done
 .endif
 
 ${SUBDIR:N.WAIT}: .PHONY .MAKE


More information about the svn-src-head mailing list