mergemaster broken?

Ruslan Ermilov ru at freebsd.org
Tue Mar 21 06:29:43 UTC 2006


On Mon, Mar 20, 2006 at 03:40:06PM -0800, John-Mark Gurney wrote:
> 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?
> 
I didn't care looking into how -m is documented until now.  :-)
OK, I will make it do what it ought to be, i.e. point at src/ top.


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20060321/1332c999/attachment.pgp


More information about the freebsd-current mailing list