Re: mergemaster broken?

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.


Cheers,
-- 
Ruslan Ermilov
ru_at_FreeBSD.org
FreeBSD committer