diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-03-26 13:58:44 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-03-26 13:58:44 +0000 |
commit | d58ef774dbf2f3c7b7b4e513edc2d63e005880fd (patch) | |
tree | c41bedecec8070175cb1526d8638be40292068d6 /release | |
parent | 8b50164a1996ca8427711752113df7b0d78bfb61 (diff) | |
download | FreeBSD-src-d58ef774dbf2f3c7b7b4e513edc2d63e005880fd.zip FreeBSD-src-d58ef774dbf2f3c7b7b4e513edc2d63e005880fd.tar.gz |
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).
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile | 2 | ||||
-rwxr-xr-x | release/generate-release.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index 4201ae2..e48120a 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 3c6b7f4..7519080 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 |