1 files changed, 9 insertions, 6 deletions
diff --git a/desktop/wmdrawer/wmdrawer.SlackBuild b/desktop/wmdrawer/wmdrawer.SlackBuild
index 22cef4dc780ff..e1778da31637c 100644
--- a/desktop/wmdrawer/wmdrawer.SlackBuild
+++ b/desktop/wmdrawer/wmdrawer.SlackBuild
@@ -16,10 +16,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
@@ -28,7 +31,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -50,14 +53,15 @@ mkdir -p $PKG/usr/bin
 cp -a wmdrawer $PKG/usr/bin
 strip --strip-unneeded $PKG/usr/bin/wmdrawer
 mkdir -p $PKG/usr/man/man1
-cat doc/wmdrawer.1x.gz > $PKG/usr/man/man1/wmdrawer.1x.gz
+cat doc/wmdrawer.1x.gz > $PKG/usr/man/man1/wmdrawer.1.gz
 
 mkdir -p $PKG/usr/share/pixmaps
 cp $CWD/pixmaps/* $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README TODO wmdrawerrc.example \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL README TODO wmdrawerrc.example \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cp $CWD/wmdrawerrc.Slackware $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -65,5 +69,4 @@ 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}