1 files changed, 18 insertions, 6 deletions
diff --git a/office/catdoc/catdoc.SlackBuild b/office/catdoc/catdoc.SlackBuild
index eddcd82466..44104ff2d4 100644
--- a/office/catdoc/catdoc.SlackBuild
+++ b/office/catdoc/catdoc.SlackBuild
@@ -8,7 +8,7 @@
 PRGNAM=catdoc
 VERSION=${VERSION:-0.94.2}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -44,10 +47,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --disable-debug
+  --disable-debug \
+  --build=$ARCH-slackware-linux
 
 make
 
@@ -61,6 +66,13 @@ cd doc
   cp -a catdoc.1 catppt.1 wordview.1 xls2csv.1 $PKG/usr/man/man1
 cd -
 
+mkdir -p $PKG/usr/share/catdoc
+cd charsets
+  rename .rpl .replchars *.rpl
+  rename .spc .specchars *.spc
+  cp -a *.txt *.replchars *.specchars $PKG/usr/share/catdoc
+cd -
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
@@ -74,13 +86,13 @@ cd -
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CODING.STD COPYING CREDITS INSTALL INSTALL.dos NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CODING.STD COPYING CREDITS INSTALL INSTALL.dos NEWS README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}