summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:44 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:44 -0400
commit9c18205979406703e256ed68d1d89639756ce948 (patch)
treedcd21e82f98beece8edee9ef0b71fa9e2090cb22
parent8628f79fe486d9c1e65123f73d61a2a65388969d (diff)
downloadslackbuilds-9c18205979406703e256ed68d1d89639756ce948.tar.gz
slackbuilds-9c18205979406703e256ed68d1d89639756ce948.tar.xz
multimedia/kaffeine: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--multimedia/kaffeine/kaffeine.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild
index 544db9a85b..e9a20b6a3a 100644
--- a/multimedia/kaffeine/kaffeine.SlackBuild
+++ b/multimedia/kaffeine/kaffeine.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=kaffeine
VERSION=${VERSION:-1.0_pre3}
-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
@@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors