diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-07-09 23:01:54 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-07-09 23:01:54 +0000 |
| commit | e9f4b69295e1fb2e2eefc78cf3b7855ee8314810 (patch) | |
| tree | 165f94145ebb3379b5e3e0691989ce863f896595 /release | |
| parent | 4596a120b7c479214eac9e07f04d990cb6a06191 (diff) | |
| download | FreeBSD-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')
| -rw-r--r-- | release/Makefile | 7 | ||||
| -rwxr-xr-x | release/generate-release.sh | 3 |
2 files changed, 2 insertions, 8 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} diff --git a/release/generate-release.sh b/release/generate-release.sh index 080512a..cdba026 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 |
