summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:34 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:34 -0400
commitbc399c70d0ffbe14ca267423809ea66404c2df90 (patch)
tree97a3e56affdd17bf657bc1b9bbf523258f844f0a
parentfd0f6711e8944e2ac475a298e78a77d161e66492 (diff)
downloadslackbuilds-bc399c70d0ffbe14ca267423809ea66404c2df90.tar.gz
graphics/qiv: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--graphics/qiv/qiv.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/graphics/qiv/qiv.SlackBuild b/graphics/qiv/qiv.SlackBuild
index 84e58ea761..28d5c72642 100644
--- a/graphics/qiv/qiv.SlackBuild
+++ b/graphics/qiv/qiv.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=qiv
VERSION=${VERSION:-2.2.3}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e