aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:57 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:57 -0400
commita95153fe2a422f8354137698debae64d33c8345b (patch)
tree5da708a6ca27e74f13292dbce22c2abaae719d7c
parentd3d9d4e0a0f71b51fc7fce5ff12fef16e483e063 (diff)
office/rastertospp: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--office/rastertospp/rastertospp.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/rastertospp/rastertospp.SlackBuild b/office/rastertospp/rastertospp.SlackBuild
index bea8f31370fc9..b2b1b1baff27b 100644
--- a/office/rastertospp/rastertospp.SlackBuild
+++ b/office/rastertospp/rastertospp.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=rastertospp
VERSION=${VERSION:-1.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