Date: Tue, 2 Feb 2016 17:44:53 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Conrad E. Meyer" <cem@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r295184 - head Message-ID: <63E4ABF9-89A8-46A4-8D48-3E85C0DA1892@FreeBSD.org> In-Reply-To: <201602030140.u131e8hg045908@repo.freebsd.org> References: <201602030140.u131e8hg045908@repo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
Thank you! Regards, Bryan Drewery > On Feb 2, 2016, at 17:40, Conrad E. Meyer <cem@FreeBSD.org> wrote: > > Author: cem > Date: Wed Feb 3 01:40:07 2016 > New Revision: 295184 > URL: https://svnweb.freebsd.org/changeset/base/295184 > > Log: > Revert r295167 at bdrewery's request > > $ svn merge -c -295167 . > > JHB reports Navdeep reports that it breaks distribution and etcupdate. > > Approved by: bdrewery > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Wed Feb 3 01:29:06 2016 (r295183) > +++ head/Makefile.inc1 Wed Feb 3 01:40:07 2016 (r295184) > @@ -1087,7 +1087,9 @@ distrib-dirs: .MAKE .PHONY > ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ > ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} > > -distribution: distrib-dirs .MAKE .PHONY > +distribution: .MAKE .PHONY > + ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ > + ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} > ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ > ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ > METALOG=${METALOG} installconfig >help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?63E4ABF9-89A8-46A4-8D48-3E85C0DA1892>