Build the catpages distribution in a more natural way.
This commit is contained in:
parent
078c6f01f9
commit
b6ea96d1d5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=95363
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user