From owner-cvs-all  Sun Aug  4 18: 3:17 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1F2E337B400; Sun,  4 Aug 2002 18:03:13 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C1DF343E5E; Sun,  4 Aug 2002 18:03:12 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: from freefall.freebsd.org (dougb@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7513CJU056443;
	Sun, 4 Aug 2002 18:03:12 -0700 (PDT)
	(envelope-from dougb@freefall.freebsd.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7513Cw8056442;
	Sun, 4 Aug 2002 18:03:12 -0700 (PDT)
Message-Id: <200208050103.g7513Cw8056442@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 4 Aug 2002 18:03:12 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2002/08/04 18:03:12 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Fix a couple DESTDIR related problems. Credit for the "Only in" section
  goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre
  <cyrille.lefevre@laposte.net>. The make variables problem was found
  by jon.
  
  Revision  Changes    Path
  1.36      +2 -2      src/usr.sbin/mergemaster/mergemaster.sh

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message