svn commit: r295184 - head

[Conrad E. Meyer]

Author: cem
Date: Wed Feb  3 01:40:07 2016
New Revision: 295184
URL: https://svnweb.freebsd.org/changeset/base/295184

Log:
  Revert r295167 at bdrewery's request
  
  $ svn merge -c -295167 .
  
  JHB reports Navdeep reports that it breaks distribution and etcupdate.
  
  Approved by:	bdrewery

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Feb  3 01:29:06 2016	(r295183)
+++ head/Makefile.inc1	Wed Feb  3 01:40:07 2016	(r295184)
@@ -1087,7 +1087,9 @@ distrib-dirs: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
-distribution: distrib-dirs .MAKE .PHONY
+distribution: .MAKE .PHONY
+	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig