diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-10-09 22:05:31 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-10-09 22:05:31 +0000 |
| commit | dd985c8f7a6bebd979e96ff29e1029ccdcf43898 (patch) | |
| tree | e0a0cb8a24087f0d1c8eaf270bd350c019e08dd5 /Makefile.inc1 | |
| parent | 9b4f4918ca6c60103fe902f416482a865add1394 (diff) | |
| download | src-test-dd985c8f7a6bebd979e96ff29e1029ccdcf43898.tar.gz src-test-dd985c8f7a6bebd979e96ff29e1029ccdcf43898.zip | |
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.
Notes
Notes:
svn path=/head/; revision=289086
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index e2c967daeb9e6..d4e24e4b5d37a 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 # |