summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:31 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:31 -0400
commit241c4a781ca6eb0a7b54dfb018054be7ce17b0c8 (patch)
treef6b0c25e03349bdceb220469667c23d2c595b451
parent252cd39025bf914fddeeee38f59a51bf8ac2eabf (diff)
downloadslackbuilds-241c4a781ca6eb0a7b54dfb018054be7ce17b0c8.tar.gz
network/xl2tpd: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--network/xl2tpd/xl2tpd.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/xl2tpd/xl2tpd.SlackBuild b/network/xl2tpd/xl2tpd.SlackBuild
index 53ba7c73c8..9b5a3367e7 100644
--- a/network/xl2tpd/xl2tpd.SlackBuild
+++ b/network/xl2tpd/xl2tpd.SlackBuild
@@ -2,10 +2,19 @@
PRGNAM=xl2tpd
VERSION=1.2.4
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -20,6 +29,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e