summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:45 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:45 -0400
commita53969c18a9cd2829ff2b74786e01df1f296808a (patch)
treeb9b020b6aae97b91fce96d7b0c8733864a74915d
parent302b2d1316ec91c8e957138faa9f5a5183815eae (diff)
downloadslackbuilds-a53969c18a9cd2829ff2b74786e01df1f296808a.tar.gz
office/grisbi: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--office/grisbi/grisbi.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/grisbi/grisbi.SlackBuild b/office/grisbi/grisbi.SlackBuild
index 974fc92a02..1384b6fff1 100644
--- a/office/grisbi/grisbi.SlackBuild
+++ b/office/grisbi/grisbi.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=grisbi
VERSION=${VERSION:-0.6.0b2}
-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
@@ -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