summaryrefslogtreecommitdiffstats
path: root/release/Makefile
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-07-09 23:01:54 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-07-09 23:01:54 +0000
commite9f4b69295e1fb2e2eefc78cf3b7855ee8314810 (patch)
tree165f94145ebb3379b5e3e0691989ce863f896595 /release/Makefile
parent4596a120b7c479214eac9e07f04d990cb6a06191 (diff)
downloadFreeBSD-src-e9f4b69295e1fb2e2eefc78cf3b7855ee8314810.zip
FreeBSD-src-e9f4b69295e1fb2e2eefc78cf3b7855ee8314810.tar.gz
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
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile
index f8a52d6..0e07ed3 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}
OpenPOWER on IntegriCloud