Build the catpages distribution in a more natural way.

1 files changed, 6 insertions, 7 deletions

diff --git a/release/scripts/catpages-make.sh b/release/scripts/catpages-make.sh
index ea2c7b3..755057d 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