From dd985c8f7a6bebd979e96ff29e1029ccdcf43898 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 9 Oct 2015 22:05:31 +0000
Subject: [PATCH] Change make distribution so that it now call installconfig in
 all dirs along with the current behaviour of calling "distribution" in the
 etc target.

This allows mergemaster/etcupdate to still work when some configuration will be
moved to be handled in the same directories their source code lives in.
---
 Makefile.inc1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index e2c967daeb9e..d4e24e4b5d37 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -996,10 +996,15 @@ redistribute: .MAKE
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs distribution: .MAKE
+distrib-dirs: .MAKE
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
+distribution: .MAKE
+	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 installconfig
+
 #
 # buildkernel and installkernel
 #