From owner-freebsd-current@FreeBSD.ORG Mon Mar 20 23:40:10 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 5A81D16A41F; Mon, 20 Mar 2006 23:40:10 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB54A43D77; Mon, 20 Mar 2006 23:40:08 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (hcxw00877b96yt36@localhost.funkthat.com [127.0.0.1]) by hydrogen.funkthat.com (8.13.3/8.13.3) with ESMTP id k2KNe7c7072163; Mon, 20 Mar 2006 15:40:07 -0800 (PST) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.13.3/8.13.3/Submit) id k2KNe635072152; Mon, 20 Mar 2006 15:40:06 -0800 (PST) (envelope-from jmg) Date: Mon, 20 Mar 2006 15:40:06 -0800 From: John-Mark Gurney To: Ruslan Ermilov Message-ID: <20060320234006.GV35129@funkthat.com> Mail-Followup-To: Ruslan Ermilov , Steve Kargl , freebsd-current@freebsd.org References: <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu> <20060320231604.GH83781@ip.net.ua> <20060320232746.GI83781@ip.net.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060320232746.GI83781@ip.net.ua> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html Cc: freebsd-current@freebsd.org, Steve Kargl Subject: Re: mergemaster broken? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John-Mark Gurney List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 23:40:10 -0000 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? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not."