svn commit: r220542 - in head: release share/man/man7

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Apr 11 15:03:01 2011
New Revision: 220542
URL: http://svn.freebsd.org/changeset/base/220542

Log:
  Don't do make release and make install in one step. Setting DESTDIR for
  make release has deleterious consequences.

Modified:
  head/release/generate-release.sh
  head/share/man/man7/release.7

Modified: head/release/generate-release.sh
==============================================================================
--- head/release/generate-release.sh	Mon Apr 11 14:46:40 2011	(r220541)
+++ head/release/generate-release.sh	Mon Apr 11 15:03:01 2011	(r220542)
@@ -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
 

Modified: head/share/man/man7/release.7
==============================================================================
--- head/share/man/man7/release.7	Mon Apr 11 14:46:40 2011	(r220541)
+++ head/share/man/man7/release.7	Mon Apr 11 15:03:01 2011	(r220542)
@@ -295,7 +295,8 @@ svn co svn://svn.freebsd.org/base/head s
 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