From 8ef63d0dcd58e328ba45d24d5c085343eda498a5 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Mon, 11 Apr 2011 15:03:01 +0000 Subject: [PATCH] Don't do make release and make install in one step. Setting DESTDIR for make release has deleterious consequences. --- release/generate-release.sh | 3 ++- share/man/man7/release.7 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/release/generate-release.sh b/release/generate-release.sh index 01b3e2711b0..74b556efc62 100755 --- a/release/generate-release.sh +++ b/release/generate-release.sh @@ -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 diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 827a5ef502d..f76631fe02f 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -295,7 +295,8 @@ svn co svn://svn.freebsd.org/base/head src 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