d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change make distribution so that it now call installconfig in all dirs along

Browse Source 
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:
Baptiste Daroussin 2015-10-09 22:05:31 +00:00
parent 9b4f4918ca
commit dd985c8f7a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.inc1
View File

@ -996,10 +996,15 @@ redistribute: .MAKE
DISTRIBUTION=lib32 DISTRIBUTION=lib32
.endif .endif
distrib-dirs distribution: .MAKE distrib-dirs: .MAKE
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} ${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 # buildkernel and installkernel
# #