aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-02-02 20:50:09 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-02-02 20:50:09 +0000
commit7cd7d126295eebdfcaff42b1daf13d37e5abc235 (patch)
treecc729f09f575a6cce620c58a0c7f12f2e28e0c26 /Makefile.inc1
parent83b79794a0d8b2a16f3f88e704d733afee341db8 (diff)
downloadsrc-7cd7d126295eebdfcaff42b1daf13d37e5abc235.tar.gz
src-7cd7d126295eebdfcaff42b1daf13d37e5abc235.zip
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
Notes
Notes: svn path=/head/; revision=295162
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc14
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6ee07b1d19c0..222d7ec2b74f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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