From owner-svn-src-head@FreeBSD.ORG  Mon Jan  5 17:12:04 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 05E4D1065696;
	Mon,  5 Jan 2009 17:12:04 +0000 (UTC) (envelope-from sam@freebsd.org)
Received: from ebb.errno.com (ebb.errno.com [69.12.149.25])
	by mx1.freebsd.org (Postfix) with ESMTP id CA7D98FC29;
	Mon,  5 Jan 2009 17:12:03 +0000 (UTC) (envelope-from sam@freebsd.org)
Received: from trouble.errno.com (trouble.errno.com [10.0.0.248])
	(authenticated bits=0)
	by ebb.errno.com (8.13.6/8.12.6) with ESMTP id n05HC22w046870
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 5 Jan 2009 09:12:02 -0800 (PST) (envelope-from sam@freebsd.org)
Message-ID: <49623F62.6000206@freebsd.org>
Date: Mon, 05 Jan 2009 09:12:02 -0800
From: Sam Leffler <sam@freebsd.org>
Organization: FreeBSD Project
User-Agent: Thunderbird 2.0.0.18 (X11/20081209)
MIME-Version: 1.0
To: Doug Barton <dougb@freebsd.org>
References: <200901042059.n04KxNhW074100@svn.freebsd.org>
In-Reply-To: <200901042059.n04KxNhW074100@svn.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-DCC-Rhyolite-Metrics: ebb.errno.com; whitelist
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r186749 - 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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 17:12:04 -0000

Doug Barton wrote:
> Author: dougb
> Date: Sun Jan  4 20:59:23 2009
> New Revision: 186749
> URL: http://svn.freebsd.org/changeset/base/186749
>
> Log:
>   Instead of using obj and all targets which are not cross-build aware,
>   use _obj and everything which are.
>   
>   Submitted by:	ru
>
> Modified:
>   head/usr.sbin/mergemaster/mergemaster.sh
>
> Modified: head/usr.sbin/mergemaster/mergemaster.sh
> ==============================================================================
> --- head/usr.sbin/mergemaster/mergemaster.sh	Sun Jan  4 19:23:44 2009	(r186748)
> +++ head/usr.sbin/mergemaster/mergemaster.sh	Sun Jan  4 20:59:23 2009	(r186749)
> @@ -592,10 +592,11 @@ case "${RERUN}" in
>          ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
>          ;;
>        esac
> +      od=${TEMPROOT}/usr/obj
>        ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
> -      MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} obj SUBDIR_OVERRIDE=etc &&
> -      MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} all SUBDIR_OVERRIDE=etc &&
> -      MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
> +      MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
> +      MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
> +      MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
>      { echo '';
>       echo "  *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
>        echo "      the temproot environment";
>
>
>   
This fixes my cross-install setup; thank you.

    Sam