From 3a20439f1cd7912b9fc98ae1ad995f31420d9f9d Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Sat, 26 Mar 2011 13:58:44 +0000 Subject: [PATCH] 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). --- release/Makefile | 2 +- release/generate-release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 4201ae2032a..e48120ab89e 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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} diff --git a/release/generate-release.sh b/release/generate-release.sh index 3c6b7f4ecb6..751908019c4 100755 --- a/release/generate-release.sh +++ b/release/generate-release.sh @@ -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