Date: Mon, 20 Mar 2006 15:40:06 -0800 From: John-Mark Gurney <gurney_j@resnet.uoregon.edu> To: Ruslan Ermilov <ru@freebsd.org> Cc: freebsd-current@freebsd.org, Steve Kargl <sgk@troutmask.apl.washington.edu> Subject: Re: mergemaster broken? Message-ID: <20060320234006.GV35129@funkthat.com> In-Reply-To: <20060320232746.GI83781@ip.net.ua> References: <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu> <20060320231604.GH83781@ip.net.ua> <20060320232746.GI83781@ip.net.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
Ruslan Ermilov wrote this message on Tue, Mar 21, 2006 at 01:27 +0200:
> On Tue, Mar 21, 2006 at 01:16:04AM +0200, Ruslan Ermilov wrote:
> > On Mon, Mar 20, 2006 at 03:00:10PM -0800, Steve Kargl wrote:
> > > On Mon, Mar 20, 2006 at 02:17:41PM -0800, Steve Kargl wrote:
> [...]
> > > > "/usr/src/etc/Makefile", line 206: Malformed conditional (${MK_SENDMAIL} != "no")
> > > > "/usr/src/etc/Makefile", line 208: if-less endif
> > > > make: fatal errors encountered -- cannot continue
> > > >
> > > > *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
> > > > the temproot environment
> > > >
> > >
> > > This appears to be related to ru's recent Makefile sweep.
> > >
> > mergemaster(8) should be fixed to run "make distrib-dirs" and "make
> > distribution" from /usr/src, not from /usr/src/etc.
> >
> The attached patch seems to work.
Should we also document that -m is suppose to be src's etc dir instead
of src? I've accidentally pointed -m at src, and then it does a make
which is quite ammuzing as it's completely the wrong thing... Or now
that we call outside of /etc, should we make -m really point to src,
and have the proper calls add etc to the directory?
--
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060320234006.GV35129>