summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:13:15 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:13:15 -0400
commitf253c0678ce8481c529141eb7aff34275cb9d6d6 (patch)
tree19e57b109b354da8940b2236a683ebb941b0e0d4
parentf52de978771ca85d7d1db662f51f538f7de8e036 (diff)
downloadslackbuilds-f253c0678ce8481c529141eb7aff34275cb9d6d6.tar.gz
network/midori: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--network/midori/midori.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild
index 32760e310e..3c9a606f70 100644
--- a/network/midori/midori.SlackBuild
+++ b/network/midori/midori.SlackBuild
@@ -26,10 +26,19 @@
PRGNAM=midori
VERSION=0.2.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
@@ -46,6 +55,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -eu