summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:08:15 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:47 -0500
commit55382320c4f68f2210a60f232e8ddc8a89914b83 (patch)
treeab49b4cfc18c6d513582d777137a856d32a5a2d3
parent34adb37b816a1c106e7df2488ea6056b1e6dbe45 (diff)
downloadslackbuilds-55382320c4f68f2210a60f232e8ddc8a89914b83.tar.gz
network/xtables-addons: More cleanups
-rw-r--r--network/xtables-addons/xtables-addons.SlackBuild13
1 files changed, 5 insertions, 8 deletions
diff --git a/network/xtables-addons/xtables-addons.SlackBuild b/network/xtables-addons/xtables-addons.SlackBuild
index f50daee81b..3e8f437d71 100644
--- a/network/xtables-addons/xtables-addons.SlackBuild
+++ b/network/xtables-addons/xtables-addons.SlackBuild
@@ -32,10 +32,10 @@ KERNEL=${KERNEL:-$(uname -r)}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
+ *) ARCH=$( uname -m ) ;;
esac
fi
@@ -47,15 +47,12 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
- SRCARCH=x86
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
- SRCARCH=x86
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
- SRCARCH=x86
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
@@ -85,8 +82,8 @@ CFLAGS="$SLKCFLAGS" \
--with-kbuild=/lib/modules/${KERNEL}/build \
--build=$ARCH-slackware-linux || true
-make SRCARCH=$SRCARCH
-make install DESTDIR=$PKG SRCARCH=$SRCARCH
+make
+make install DESTDIR=$PKG
# Hrm, we don't want to install these
rm -f $PKG/lib/modules/${KERNEL}/modules.*