1 files changed, 11 insertions, 11 deletions
diff --git a/desktop/wminfo/wminfo.SlackBuild b/desktop/wminfo/wminfo.SlackBuild
index b0bf0c3fa1..ed75f57b69 100644
--- a/desktop/wminfo/wminfo.SlackBuild
+++ b/desktop/wminfo/wminfo.SlackBuild
@@ -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
@@ -30,7 +33,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM
 chown -R root:root .
 find . \
@@ -40,10 +43,13 @@ find . \
  -exec chmod 644 {} \;
 
 cd wminfo
-  CFLAGS="$SLKCFLAGS" make
-  # Copying executable to the correct location 
-  mkdir -p $PKG/usr/bin
+  make \
+    LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \
+    FLAGS="$SLKCFLAGS"
+  # Copy executable to the correct location 
+  mkdir -p $PKG/usr/bin $PKG/usr/share/pixmaps
   cp -a wminfo $PKG/usr/bin
+  cp -a wminfo.xpm $PKG/usr/share/pixmaps
 cd -
 
 ( cd $PKG
@@ -53,11 +59,6 @@ cd -
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-( 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
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES COPYING INSTALL README TODO plugins \
   $PKG/usr/doc/$PRGNAM-$VERSION
@@ -67,5 +68,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}