Date: Fri, 9 Oct 2015 22:05:31 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289086 - head Message-ID: <201510092205.t99M5Vq6025029@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Oct 9 22:05:31 2015 New Revision: 289086 URL: https://svnweb.freebsd.org/changeset/base/289086 Log: 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. Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Oct 9 21:57:42 2015 (r289085) +++ head/Makefile.inc1 Fri Oct 9 22:05:31 2015 (r289086) @@ -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 #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510092205.t99M5Vq6025029>