From owner-freebsd-current@FreeBSD.ORG Tue Mar 21 06:29:43 2006 Return-Path: X-Original-To: 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 6841616A423 for ; Tue, 21 Mar 2006 06:29:43 +0000 (UTC) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DE2843D49 for ; Tue, 21 Mar 2006 06:29:35 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id k2L6TXAa095066; Tue, 21 Mar 2006 08:29:33 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ip.net.ua [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 97822-24; Tue, 21 Mar 2006 08:29:06 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id k2L6SeJM095046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 21 Mar 2006 08:28:40 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id k2L6T13A077913; Tue, 21 Mar 2006 08:29:01 +0200 (EET) (envelope-from ru) Date: Tue, 21 Mar 2006 08:29:01 +0200 From: Ruslan Ermilov To: Steve Kargl , freebsd-current@freebsd.org Message-ID: <20060321062901.GB77849@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> <20060320234006.GV35129@funkthat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="lEGEL1/lMxI0MVQ2" Content-Disposition: inline In-Reply-To: <20060320234006.GV35129@funkthat.com> User-Agent: Mutt/1.5.11 X-Virus-Scanned: amavisd-new at ip.net.ua Cc: Subject: Re: mergemaster broken? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 06:29:43 -0000 --lEGEL1/lMxI0MVQ2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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_SE= NDMAIL} !=3D "no") > > > > > "/usr/src/etc/Makefile", line 208: if-less endif > > > > > make: fatal errors encountered -- cannot continue > > > > >=20 > > > > > *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files = to > > > > > the temproot environment > > > > >=20 > > > >=20 > > > > This appears to be related to ru's recent Makefile sweep. > > > >=20 > > > mergemaster(8) should be fixed to run "make distrib-dirs" and "make > > > distribution" from /usr/src, not from /usr/src/etc. > > >=20 > > The attached patch seems to work. >=20 > 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? >=20 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, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --lEGEL1/lMxI0MVQ2 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFEH50tqRfpzJluFF4RApYHAJ9ySV+zKuGsqGiCKx1N37jcFOGbfQCeJ61f QSA8OfiH11dqm5RqwrsaGhY= =AgZm -----END PGP SIGNATURE----- --lEGEL1/lMxI0MVQ2--