summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:58 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:58 -0400
commitb0a89170ca9418a2024d24769ec11ce1acf91d27 (patch)
tree0463c34031708907a5c80b119a619777106496d4 /misc
parent24bcb9dfc6e306e0529887155eacc536bda6f742 (diff)
downloadslackbuilds-b0a89170ca9418a2024d24769ec11ce1acf91d27.tar.gz
misc/gnome-keyring: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/gnome-keyring/gnome-keyring.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/gnome-keyring/gnome-keyring.SlackBuild b/misc/gnome-keyring/gnome-keyring.SlackBuild
index 07af014b04..b1dba8ce56 100644
--- a/misc/gnome-keyring/gnome-keyring.SlackBuild
+++ b/misc/gnome-keyring/gnome-keyring.SlackBuild
@@ -25,10 +25,19 @@
PRGNAM=gnome-keyring
VERSION=${VERSION:-2.24.1}
-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
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e