From owner-freebsd-current@FreeBSD.ORG  Tue Jul 22 11:12:22 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 84B0037B401; Tue, 22 Jul 2003 11:12:22 -0700 (PDT)
Received: from rwcrmhc11.comcast.net (rwcrmhc11.comcast.net [204.127.198.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 01B0043F3F; Tue, 22 Jul 2003 11:12:22 -0700 (PDT)
	(envelope-from DougB@freebsd.org)
Received: from master.dougb.net
	(12-234-22-23.client.attbi.com[12.234.22.23](untrusted sender))
	by attbi.com (rwcrmhc11) with SMTP
	id <2003072218122101300gs2b1e>; Tue, 22 Jul 2003 18:12:21 +0000
Date: Tue, 22 Jul 2003 11:12:20 -0700 (PDT)
From: Doug Barton <DougB@FreeBSD.org>
To: Ruslan Ermilov <ru@freebsd.org>
In-Reply-To: <20030722123618.GB36151@sunbay.com>
Message-ID: <20030722111201.T7043@znfgre.qbhto.arg>
References: <20030707120002.18029e92.yosimoto@waishi.jp>
	<20030722123618.GB36151@sunbay.com>
Organization: http://www.FreeBSD.org/
X-message-flag: Outlook -- Not just for spreading viruses anymore!
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: Gregory Neil Shapiro <gshapiro@freebsd.org>
cc: current@freebsd.org
Subject: Re: mergemaster broken
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2003 18:12:22 -0000

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