From 29f81a6b2ce89b2489dd0372ddede4ff1c89146a Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:14:35 -0400 Subject: [PATCH] office/abook: Misc automated cleanups. Signed-off-by: David Somero --- office/abook/abook.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/office/abook/abook.SlackBuild b/office/abook/abook.SlackBuild index 972d352bbb..4489c3f55a 100644 --- a/office/abook/abook.SlackBuild +++ b/office/abook/abook.SlackBuild @@ -26,10 +26,19 @@ PRGNAM=abook VERSION=0.5.6 -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 @@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # Exit on most errors.