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.
This commit is contained in:
parent
9b4f4918ca
commit
dd985c8f7a
@ -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
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user