From owner-cvs-src@FreeBSD.ORG  Sat Mar  6 07:03:22 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5F5D316A4CE; Sat,  6 Mar 2004 07:03:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 41E9643D45; Sat,  6 Mar 2004 07:03:22 -0800 (PST)
	(envelope-from ru@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i26F3MGe056157;
	Sat, 6 Mar 2004 07:03:22 -0800 (PST)
	(envelope-from ru@repoman.freebsd.org)
Received: (from ru@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i26F3LOc056156;
	Sat, 6 Mar 2004 07:03:21 -0800 (PST)
	(envelope-from ru)
Message-Id: <200403061503.i26F3LOc056156@repoman.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sat, 6 Mar 2004 07:03:21 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Mar 2004 15:03:22 -0000

ru          2004/03/06 07:03:21 PST

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Set MAKEOBJDIRPREFIX in the environment, like God intended.  This
  only worked because src/Makefile.inc1 is wrapped by src/Makefile.
  
  Silence from:   dougb
  
  Revision  Changes    Path
  1.50      +3 -3      src/usr.sbin/mergemaster/mergemaster.sh