svn commit: r295162 - head

[Bryan Drewery]

Author: bdrewery
Date: Tue Feb  2 20:50:09 2016
New Revision: 295162
URL: https://svnweb.freebsd.org/changeset/base/295162

Log:
  Adjust install .WAITs for lib/ and etc/ to allow parallelization more.
  
  Only 'installworld' needs to be protected and only when not using
  -DNO_ROOT, which implies not installing to / and not needing the
  lib dependency protections.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Feb  2 20:50:06 2016	(r295161)
+++ head/Makefile.inc1	Tue Feb  2 20:50:09 2016	(r295162)
@@ -72,7 +72,7 @@ SRCDIR?=	${.CURDIR}
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
-.if make(install*)
+.if !defined(NO_ROOT) && (make(installworld) || make(install))
 # Ensure libraries are installed before progressing.
 SUBDIR+=.WAIT
 .endif
@@ -127,7 +127,7 @@ SUBDIR+=	${_DIR}
 # by calling 'makedb' in share/man.  This is only relevant for
 # install/distribute so they build the whatis file after every manpage is
 # installed.
-.if make(install*)
+.if make(installworld) || make(install)
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=etc