aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-07-09 23:01:54 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-07-09 23:01:54 +0000
commitbfc3bab8655cc6ab122d387da2bb91d01db3646e (patch)
tree165f94145ebb3379b5e3e0691989ce863f896595 /release
parent5863e1bc8cc14c9712b67428bad68d982c03d248 (diff)
downloadsrc-bfc3bab8655cc6ab122d387da2bb91d01db3646e.tar.gz
src-bfc3bab8655cc6ab122d387da2bb91d01db3646e.zip
Per request of the docs team, install docs as packages, instead of via
the normal distfile mechanism. Thanks to Marc Fonvieille for the patch and for putting up with me taking entirely too long to commit this! Submitted by: blackend
Notes
Notes: svn path=/head/; revision=223897
Diffstat (limited to 'release')
-rw-r--r--release/Makefile7
-rwxr-xr-xrelease/generate-release.sh3
2 files changed, 2 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile
index f8a52d6f78b9..0e07ed3a45b7 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -68,12 +68,7 @@ base.txz:
# Set up mergemaster root database
sh ${.CURDIR}/scripts/mm-mtree.sh -F \
"TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${DISTDIR}/base"
-# Merge handbook, etc. from doc tree into src tree doc distribution
-.if !defined(NODOC)
- cd ${DOCDIR} && ${IMAKE} all install \
- DOCDIR=${DISTDIR}/doc/usr/share/doc 'FORMATS=html html-split txt' \
- INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES
-.endif
+# Package all components
cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${DISTDIR}
mv ${DISTDIR}/*.txz ${.OBJDIR}
diff --git a/release/generate-release.sh b/release/generate-release.sh
index 080512a89ee8..cdba0267346f 100755
--- a/release/generate-release.sh
+++ b/release/generate-release.sh
@@ -57,9 +57,8 @@ fi
if [ -d $2/usr/doc ]; then
cp /etc/resolv.conf $2/etc/resolv.conf
- # Build ports to build the docs, then build the docs
+ # Build ports to build release documentation
chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)'
- chroot $2 make -C /usr/doc $MAKE_FLAGS 'FORMATS=html html-split txt' URLS_ABSOLUTE=YES
fi
chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel