summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-18 16:31:02 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-18 16:31:02 -0500
commit98ef2c221073686c636206c1fc4036292150e741 (patch)
tree8e32af219b81483ce0e3737728a3271cedaf93ac
parent76a074f9d07d07cdf40e79fbbbeecfd1056dc827 (diff)
downloadslackbuilds-98ef2c221073686c636206c1fc4036292150e741.tar.gz
graphics/ristretto: Miscellaneous script cleanups.
-rw-r--r--graphics/ristretto/ristretto.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/graphics/ristretto/ristretto.SlackBuild b/graphics/ristretto/ristretto.SlackBuild
index dc54961c68..b3726a57bb 100644
--- a/graphics/ristretto/ristretto.SlackBuild
+++ b/graphics/ristretto/ristretto.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=ristretto
VERSION=0.0.22
-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) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e