From owner-svn-src-all@FreeBSD.ORG  Sat Mar 26 13:58:44 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C129106566B;
	Sat, 26 Mar 2011 13:58:44 +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 7B3648FC12;
	Sat, 26 Mar 2011 13:58:44 +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 p2QDwiAZ023787;
	Sat, 26 Mar 2011 13:58:44 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2QDwinN023784;
	Sat, 26 Mar 2011 13:58:44 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201103261358.p2QDwinN023784@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 26 Mar 2011 13:58:44 +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: r220037 - head/release
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Mar 2011 13:58:44 -0000

Author: nwhitehorn
Date: Sat Mar 26 13:58:44 2011
New Revision: 220037
URL: http://svn.freebsd.org/changeset/base/220037

Log:
  Cause the release target to set up its object directory. It is designed
  to be a meta-target, and having it do this avoids it spewing files all
  over the source tree by default (and possible recursive tarring if
  distributing a src tarball).

Modified:
  head/release/Makefile
  head/release/generate-release.sh

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Sat Mar 26 13:07:07 2011	(r220036)
+++ head/release/Makefile	Sat Mar 26 13:58:44 2011	(r220037)
@@ -142,7 +142,7 @@ ftp: packagesystem
 	mkdir ${.OBJDIR}/ftp
 	cp ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST ${.OBJDIR}/ftp
 
-release: ${RELEASE_TARGETS}
+release: obj ${RELEASE_TARGETS}
 
 clean:
 	chflags -R noschg ${.OBJDIR}

Modified: head/release/generate-release.sh
==============================================================================
--- head/release/generate-release.sh	Sat Mar 26 13:07:07 2011	(r220036)
+++ head/release/generate-release.sh	Sat Mar 26 13:58:44 2011	(r220037)
@@ -60,7 +60,7 @@ 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 obj release" || exit 1
+chroot $2 /bin/sh -c "cd /usr/src/release && make release" || exit 1
 mkdir $2/R
 cp -pRP $2/usr/obj/usr/src/release/release.iso $2/usr/obj/usr/src/release/memstick $2/usr/obj/usr/src/release/ftp $2/R