svn commit: r295217 - head

[Bryan Drewery]

Author: bdrewery
Date: Wed Feb  3 20:24:21 2016
New Revision: 295217
URL: https://svnweb.freebsd.org/changeset/base/295217

Log:
  Deduplicate distrib-dirs logic from r289086 in distribution.
  
  This does it correctly this time, rather than the incorrect version in
  r295167.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Feb  3 19:08:45 2016	(r295216)
+++ head/Makefile.inc1	Wed Feb  3 20:24:21 2016	(r295217)
@@ -1083,16 +1083,14 @@ redistribute: .MAKE .PHONY
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs: .MAKE .PHONY
-	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
-
-distribution: .MAKE .PHONY
+distrib-dirs distribution: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+.if make(distribution)
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig
+.endif
 
 #
 # buildkernel and installkernel