1 files changed, 10 insertions, 13 deletions
diff --git a/audio/calf/calf.SlackBuild b/audio/calf/calf.SlackBuild
index 25fc541962..7d30e66878 100644
--- a/audio/calf/calf.SlackBuild
+++ b/audio/calf/calf.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for calf
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
+# 20211204 bkw: BUILD=3, move html docs to subdir.
 # 20200117 bkw: demote lash from required to optional dependency.
-
 # 20191208 bkw: update for v0.90.3.
 
 # 20180709 bkw:
@@ -40,7 +40,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=calf
 VERSION=${VERSION:-0.90.3}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -52,9 +52,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -116,6 +113,8 @@ echo "=== SSEOPT: $SSEOPT"
 WITHSSE="without"
 [ "$SSEOPT" = "--enable-sse" ] && WITHSSE="with"
 
+# 20211204 bkw: --docdir and --htmldir accepted and ignored.
+# htmldir on the make command line is also ignored (html docs go to docdir).
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -126,22 +125,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --htmldir=/usr/doc/$PRGNAM-$VERSION \
   --enable-shared \
   --disable-static \
   --with-lv2-dir=/usr/lib${LIBDIRSUFFIX}/lv2 \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
+make install \
+     DESTDIR=$PKG \
+     docdir=/usr/doc/$PRGNAM-$VERSION/html \
 
 # install-strip is supported, but doesn't work:
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/* $PKG/usr/lib*/{lv2/calf.lv2/calflv2gui.so,calf/calf.so}
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING* ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION