mergemaster broken

[Doug Barton]

I'll take a look at this, thanks.

On Tue, 22 Jul 2003, Ruslan Ermilov wrote:

> On Sun, Jul 06, 2003 at 08:21:14PM -0700, Gregory Neil Shapiro wrote:
> > > > mergemaster -dv
> > >
> > > [snip]
> > >
> > > cd /usr/src/etc/sendmail; make distribution
> > > install -o root -g wheel -m 644  /usr/src/etc/sendmail/freebsd.mc freebsd.cf /var/tmp/temproot.0707.11.55/etc/mail
> > > install: freebsd.cf: No such file or directory
> > > *** Error code 71
> >
> > Thanks, I just committed a fix for this.
> >
> Er,
>
> The correct fix would be to revert this change from sendmail/Makefile,
> and fix mergemaster(8) instead, as shown in the attached patch.  The
> "distribution" target of src/etc/Makefile is part of the standard
> "distribute" target, and as such it's just a specialized version of
> the "install" target that should not _build_ anything (and that was
> fixed in rev. 1.23).  To build things, one needs to call the "all"
> target, which the attached patch simply does.  It's just a pure
> coincidence that the "distribution" part of src/etc/Makefile does
> not need to build anything (in the object directory).
>
> Can you please test it and commit?
>
>
> Cheers,
>

-- 

    This .signature sanitized for your protection