1 files changed, 15 insertions, 10 deletions
diff --git a/network/arptables/arptables.SlackBuild b/network/arptables/arptables.SlackBuild
index 397ba76ec3..082e176e58 100644
--- a/network/arptables/arptables.SlackBuild
+++ b/network/arptables/arptables.SlackBuild
@@ -21,10 +21,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 # exit on most errors
@@ -33,7 +36,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-v$VERSION-3
-tar xzvf $CWD/$PRGNAM-v$VERSION-3.tar.gz 
+tar xvf $CWD/$PRGNAM-v$VERSION-3.tar.gz 
 cd $PRGNAM-v$VERSION-3 
 
 chown -R root:root .
@@ -43,18 +46,20 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-# Configure and build
-sed -i -e "s/^\(COPT_FLAGS:=\).*/\1$SLKCFLAGS/" \
-       -e "s#^\(PREFIX:=\).*#\1/usr#" Makefile
-
 mkdir -p $PKG/usr/{man,sbin}
 mkdir -p $PKG/etc/{sysconfig,rc.d/init.d}
 
-make
+make \
+  COPT_FLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  BINDIR=/usr/sbin \
+  SYSCONFIGDIR=/etc
 
-BINDIR=/usr/sbin \
-SYSCONFIGDIR=/etc \
-make install DESTDIR=$PKG
+make install \
+  PREFIX=/usr \
+  BINDIR=/usr/sbin \
+  SYSCONFIGDIR=/etc \
+  DESTDIR=$PKG
 
 # Move the init script to .new and let doinst.sh handle it
 ( cd $PKG/etc/rc.d/init.d
@@ -83,4 +88,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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}