From owner-cvs-all  Wed Nov  8 16:19:25 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0C73D37B4C5; Wed,  8 Nov 2000 16:19:22 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id QAA18947;
	Wed, 8 Nov 2000 16:19:22 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Message-Id: <200011090019.QAA18947@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 8 Nov 2000 16:19:22 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2000/11/08 16:19:22 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  * Reduce diffs to RELENG_4 by specifying a full path to sysctl
  * Adjust a little whitespace
  * Make the distrib-dirs/mtree on DESTDIR conditional on user
    actually specifying a DESTDIR. This seemed like a safe
    way to get the right directories and permissions in the
    installed tree since 'make installworld' does the same
    thing, but in practice too many people have custom hacks
    that we should leave unmolested. Still need to find a way
    to deal with 'install -d' and permissions on nonexistent
    directories in the middle of the path, but this is at
    least no worse that it was before.
  
  PR:		bin/22661
  
  Revision  Changes    Path
  1.9       +2 -2      src/usr.sbin/mergemaster/mergemaster.8
  1.16      +10 -4     src/usr.sbin/mergemaster/mergemaster.sh



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