3 files changed, 11 insertions, 23 deletions
diff --git a/libraries/slib/doinst.sh b/libraries/slib/doinst.sh
new file mode 100644
index 0000000000..41cfc6360e
--- /dev/null
+++ b/libraries/slib/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/guile -q -s /usr/doc/@PRGNAM@-@VERSION@/guile-slibcat.script
diff --git a/libraries/slib/guile-slibcat.script b/libraries/slib/guile-slibcat.script
new file mode 100644
index 0000000000..bccf751cc7
--- /dev/null
+++ b/libraries/slib/guile-slibcat.script
@@ -0,0 +1,3 @@
+(use-modules (ice-9 slib))
+(require 'new-catalog)
+(quit)
diff --git a/libraries/slib/slib.SlackBuild b/libraries/slib/slib.SlackBuild
index 7e9a588f7e..3a33ff1198 100644
--- a/libraries/slib/slib.SlackBuild
+++ b/libraries/slib/slib.SlackBuild
@@ -24,15 +24,13 @@
 
 PRGNAM=slib
 VERSION=3b2
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -79,10 +77,8 @@ make libdir=/usr/lib${LIBDIRSUFFIX}/ install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
 
 # The Makefile is braindead
 sed -i "s%$PKG%%g" $PKG/usr/bin/slib
@@ -102,23 +98,11 @@ cp -a \
   ANNOUNCE FAQ COPYING ChangeLog README \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# Guile script to be run on installation, to build slibcat
-cat >> $PKG/usr/doc/$PRGNAM-$VERSION/guile-slibcat.script << EOF
-(use-modules (ice-9 slib))
-(require 'new-catalog)
-(quit)
-EOF
-
+cat $CWD/guile-slibcat.script > $PKG/usr/doc/$PRGNAM-$VERSION/guile-slibcat.script
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat >> $PKG/install/doinst.sh <<EOF
-#!/bin/sh
-
-guile -q -s /usr/doc/$PRGNAM-$VERSION/guile-slibcat.script
-
-EOF
-
+sed -e s/@PRGNAM@/$PRGNAM/ -e s/@VERSION@/$VERSION/ $CWD/doinst.sh > $PKG/install/doinst.sh
+ 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}