summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:03 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:03 -0400
commitbd367ea811ef894b5541d8dd12b5f035ac4ac4bf (patch)
tree399ad7bd5db5b003a4a4a21d0a6be5f75166fda4
parent8b37c2555d9bca82e5f5b5bc1aec436ef4efcfc6 (diff)
downloadslackbuilds-bd367ea811ef894b5541d8dd12b5f035ac4ac4bf.tar.gz
desktop/google-gadgets-for-linux: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/google-gadgets-for-linux/google-gadgets-for-linux.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/google-gadgets-for-linux/google-gadgets-for-linux.SlackBuild b/desktop/google-gadgets-for-linux/google-gadgets-for-linux.SlackBuild
index abd79307f0..becfabf130 100644
--- a/desktop/google-gadgets-for-linux/google-gadgets-for-linux.SlackBuild
+++ b/desktop/google-gadgets-for-linux/google-gadgets-for-linux.SlackBuild
@@ -21,10 +21,19 @@
PRGNAM=google-gadgets-for-linux
VERSION=0.11.2
-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
@@ -39,6 +48,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e