diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-02-02 22:27:48 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-02-02 22:27:48 +0000 |
| commit | 221b3499126e3891b22e08cd6b5d3866c26ef900 (patch) | |
| tree | 5ea64f05cc16d8a5032524fdefec823e707e1ff3 /Makefile.inc1 | |
| parent | 43faedc1339a9624c7acedb7f3e5624e64da5b99 (diff) | |
| parent | 6350eae8e458637096ee44d0968961cfa4c41810 (diff) | |
| download | src-221b3499126e3891b22e08cd6b5d3866c26ef900.tar.gz src-221b3499126e3891b22e08cd6b5d3866c26ef900.zip | |
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-pkg/; revision=295172
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5650ef2134d5..a13438225960 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 @@ -1125,9 +1125,7 @@ distrib-dirs: .MAKE .PHONY ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} -distribution: .MAKE .PHONY - ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ - ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} +distribution: distrib-dirs .MAKE .PHONY ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ METALOG=${METALOG} installconfig |