From owner-svn-src-head@FreeBSD.ORG Fri Jan 2 00:41:39 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 269B1106567C for ; Fri, 2 Jan 2009 00:41:39 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id B07498FC54 for ; Fri, 2 Jan 2009 00:41:38 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 1318 invoked by uid 399); 2 Jan 2009 00:41:38 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 2 Jan 2009 00:41:38 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <495D62C0.7090306@FreeBSD.org> Date: Thu, 01 Jan 2009 16:41:36 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.18 (X11/20081128) MIME-Version: 1.0 To: Sam Leffler References: <200901011141.n01BfDqj054333@svn.freebsd.org> <495D5FC3.6000109@freebsd.org> In-Reply-To: <495D5FC3.6000109@freebsd.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186678 - head/usr.sbin/mergemaster X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2009 00:41:39 -0000 Sam Leffler wrote: > Doug Barton wrote: >> 1. Switch to using the top level (e.g., /usr/src) Makefile, and specify >> that we should use the *.mk files from the source directory instead of >> the installed versions. [1][2] This allows easier cross builds and >> simplifies (or in some cases permits) upgrading. >> > > I believe you changed the meaning of the -m flag so it now requires a > pathname to the src tree and not src/etc. This breaks existing usage. > In the PR I filed there was a follow-on patch from Bjoern that amended > my suggestion to instead add a -M option to set the source tree. I > thought that was an improvement over my hack. In lieu of that you might > want to examine the pathname supplied to -m to try to provide backwards > compatibility by stripping any /etc suffix on the path. The version in bin/96528 from ru had a better fix for this issue, but thanks for thinking of it. :) Doug -- This .signature sanitized for your protection