1 files changed, 20 insertions, 18 deletions
diff --git a/network/wol/wol.SlackBuild b/network/wol/wol.SlackBuild
index c28cc42a09..a1046ec98e 100644
--- a/network/wol/wol.SlackBuild
+++ b/network/wol/wol.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wol
 
-# Written by Brian Muramatsu (brian@fhobia.org)
+# Written by Brian Muramatsu (btmura@gmail.com)
 
 PRGNAM=wol
 VERSION=${VERSION:-0.7.1}
@@ -23,12 +23,14 @@ elif [ "$ARCH" = "x86_64" ]; then
    SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -41,33 +43,33 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/man
-find $PKG/usr/doc -name "Makefile*" -exec rm -f {} \;
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
    find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
    find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-# Compress info pages and remove the package's dir file
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+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