From 9c654427e56af6a24bacb25ee0e9151fde7d96b2 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 00:59:24 -0400 Subject: academic/sword: Misc automated cleanups. Signed-off-by: David Somero --- academic/sword/sword.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'academic') diff --git a/academic/sword/sword.SlackBuild b/academic/sword/sword.SlackBuild index 3fa12f7259..3ab07da936 100644 --- a/academic/sword/sword.SlackBuild +++ b/academic/sword/sword.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=sword VERSION=1.6.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 -- cgit v1.2.3