1 files changed, 12 insertions, 13 deletions
diff --git a/desktop/wmnet/wmnet.SlackBuild b/desktop/wmnet/wmnet.SlackBuild
index dba75abbe2..b027a1d432 100644
--- a/desktop/wmnet/wmnet.SlackBuild
+++ b/desktop/wmnet/wmnet.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmnet
 # Written by Cezary M. Kruk (c.kruk@bigfoot.com)
-#
+
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=wmnet
@@ -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-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -42,11 +45,14 @@ find . \
 xmkmf
 mkdir -p $PKG/usr/man/man1
 
-CFLAGS="$SLKCFLAGS" make
+make \
+  CFLAGS="$SLKCFLAGS" \
+  INCDIR="-I/usr/include/X11" \
+  LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
 make install DESTDIR=$PKG
 
 # Copying manual to the correct location 
-cp wmnet.man $PKG/usr/man/man1/wmnet.1
+gzip -9c wmnet.man > $PKG/usr/man/man1/wmnet.1.gz
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -55,19 +61,12 @@ cp wmnet.man $PKG/usr/man/man1/wmnet.1
     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 Changelog README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog README $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}