summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:13 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:13 -0400
commit88b94900abade5c651190121b57ccc9b02cc86d9 (patch)
treedb0736f8d50fa7d316b81fb262edf52c548fa306
parent95d69094902933bfd71f0f0d4f7ef6014ad2b20d (diff)
downloadslackbuilds-88b94900abade5c651190121b57ccc9b02cc86d9.tar.gz
desktop/matchbox-desktop: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/matchbox-desktop/matchbox-desktop.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild
index c5d63d34ef..0c0c6c4ffd 100644
--- a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild
+++ b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=matchbox-desktop
VERSION=0.9.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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e