aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:40 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:40 -0400
commit9d496656af8653aac7604938d6ee45c29eb22da1 (patch)
treef824c1cda490e7c00d709e92286d85e0f93bd7ff
parentd17acf304b8f43f9a34f1a38ae6359585b6a8fdd (diff)
desktop/trayer: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/trayer/trayer.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/trayer/trayer.SlackBuild b/desktop/trayer/trayer.SlackBuild
index 9530f40052bb..5c8aae0c8281 100644
--- a/desktop/trayer/trayer.SlackBuild
+++ b/desktop/trayer/trayer.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=trayer
VERSION=${VERSION:-1.0}
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e