From owner-svn-src-head@FreeBSD.ORG  Mon Apr 11 15:03:02 2011
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 61ED2106566B;
	Mon, 11 Apr 2011 15:03:01 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4EE868FC18;
	Mon, 11 Apr 2011 15:03:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3BF31wl090857;
	Mon, 11 Apr 2011 15:03:01 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3BF31wA090854;
	Mon, 11 Apr 2011 15:03:01 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201104111503.p3BF31wA090854@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 11 Apr 2011 15:03:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220542 - in head: release share/man/man7
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, 11 Apr 2011 15:03:02 -0000

Author: nwhitehorn
Date: Mon Apr 11 15:03:01 2011
New Revision: 220542
URL: http://svn.freebsd.org/changeset/base/220542

Log:
  Don't do make release and make install in one step. Setting DESTDIR for
  make release has deleterious consequences.

Modified:
  head/release/generate-release.sh
  head/share/man/man7/release.7

Modified: head/release/generate-release.sh
==============================================================================
--- head/release/generate-release.sh	Mon Apr 11 14:46:40 2011	(r220541)
+++ head/release/generate-release.sh	Mon Apr 11 15:03:01 2011	(r220542)
@@ -60,5 +60,6 @@ if [ -d $2/usr/doc ]; then 
 fi
 
 chroot $2 /bin/sh -c "cd /usr/src && make $MAKE_FLAGS buildworld buildkernel" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make release install DESTDIR=/R" || exit 1
+chroot $2 /bin/sh -c "cd /usr/src/release && make release" || exit 1
+chroot $2 /bin/sh -c "cd /usr/src/release && make install DESTDIR=/R" || exit 1
 

Modified: head/share/man/man7/release.7
==============================================================================
--- head/share/man/man7/release.7	Mon Apr 11 14:46:40 2011	(r220541)
+++ head/share/man/man7/release.7	Mon Apr 11 15:03:01 2011	(r220542)
@@ -295,7 +295,8 @@ svn co svn://svn.freebsd.org/base/head s
 cd src
 make buildworld
 cd release
-make release install DESTDIR=/var/freebsd-snapshot
+make release
+make install DESTDIR=/var/freebsd-snapshot
 .Ed
 .Pp
 After running these commands, all produced distribution files (tarballs