4 files changed, 20 insertions, 14 deletions
diff --git a/system/xchm/README b/system/xchm/README
index ecc063a3d67cc..b80e05e38ee80 100644
--- a/system/xchm/README
+++ b/system/xchm/README
@@ -1,3 +1,3 @@
 xchm is a viewer for Compiled HTML Help (.chm) files.
 
-Requires chmlib and wxGTK (both available on slackbuilds.org)
+This requires wxGTK.
diff --git a/system/xchm/slack-desc b/system/xchm/slack-desc
index 73a285215884f..940bb1b940f0b 100644
--- a/system/xchm/slack-desc
+++ b/system/xchm/slack-desc
@@ -7,13 +7,13 @@
 
     |-----handy-ruler------------------------------------------------------|
 xchm: xchm (viewer for .chm files)
-xchm: 
+xchm:
 xchm: xchm is a viewer for Compiled HTML Help (.chm) files.
-xchm: 
-xchm: 
-xchm: 
-xchm: 
-xchm: 
-xchm: 
-xchm: 
-xchm: 
+xchm:
+xchm:
+xchm:
+xchm:
+xchm:
+xchm:
+xchm:
+xchm:
diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild
index 69dccbda6caa2..e1bea647325a5 100644
--- a/system/xchm/xchm.SlackBuild
+++ b/system/xchm/xchm.SlackBuild
@@ -16,10 +16,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -41,21 +44,22 @@ CFLAGS=$SLKCFLAGS \
 CXXFLAGS=$SLKCFLAGS \
 ./configure  \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
 make 
 make install DESTDIR=$PKG 
-
 strip --strip-unneeded $PKG/usr/bin/$PRGNAM 2> /dev/null
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README README.xmlrpc \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README README.xmlrpc \
+    $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}
diff --git a/system/xchm/xchm.info b/system/xchm/xchm.info
index a61691a9a8920..1f4ba824be59e 100644
--- a/system/xchm/xchm.info
+++ b/system/xchm/xchm.info
@@ -3,6 +3,8 @@ VERSION="1.14"
 HOMEPAGE="http://xchm.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/xchm/xchm-1.14.tar.gz"
 MD5SUM="0f398af788a9e1a7c6f4e65b5ca31cf3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michael Gehring"
 EMAIL="mg@ebfe.org"
 APPROVED="rworkman"