aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
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 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}