diff options
| -rw-r--r-- | release/Makefile | 3 | ||||
| -rwxr-xr-x | release/scripts/catpages-make.sh | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile index fdb2447561d4..4795be4c0365 100644 --- a/release/Makefile +++ b/release/Makefile @@ -129,7 +129,7 @@ COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x .else COMPAT_DISTS?= compat4x .endif -OTHER_DISTS?= manpages catpages games proflibs dict info doc +OTHER_DISTS?= catpages manpages games proflibs dict info doc CRYPTO_DISTS?= crypto krb4 krb5 BASE_DISTS?= base DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} @@ -389,6 +389,7 @@ rerelease release: echo "export PATH=${BOOTSTRAPDIR}:$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk echo "export TMPDIR=/tmp" >> ${CHROOTDIR}/mk echo "export MAKEOBJDIRPREFIX=/usr/obj" >> ${CHROOTDIR}/mk + echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk echo " cd /usr/src" >> ${CHROOTDIR}/mk .if make(release) diff --git a/release/scripts/catpages-make.sh b/release/scripts/catpages-make.sh index ea2c7b3c0760..755057d40ccb 100755 --- a/release/scripts/catpages-make.sh +++ b/release/scripts/catpages-make.sh @@ -3,11 +3,10 @@ # $FreeBSD$ # -# Create the catpages dist - must follow manpages dist script, for obvious -# reasons. -if [ -d ${RD}/trees/manpages/usr/share/man ]; then - su -m man -c 'catman ${RD}/trees/manpages/usr/share/man' > /dev/null 2>&1; - ( cd ${RD}/trees/manpages/usr/share/man; - find cat* whatis | cpio -dumpl ${RD}/trees/catpages/usr/share/man ) && - rm -rf ${RD}/trees/manpages/usr/share/man/cat*; +# Move all the catpages out to their own dist, using the base dist as a +# starting point. This must precede the manpages dist script. +if [ -d ${RD}/trees/base/usr/share/man ]; then + ( cd ${RD}/trees/base/usr/share/man; + find cat* whatis | cpio -dumpl ${RD}/trees/catpages/usr/share/man > /dev/null 2>&1) && + rm -rf ${RD}/trees/base/usr/share/man/cat*; fi |