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