From 4a511a9a68fec81d600e736501f0ca6308a5f927 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:14:58 -0400 Subject: office/scribus: Misc automated cleanups. Signed-off-by: David Somero --- office/scribus/scribus.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'office') diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index 1692b36777..dc4384d203 100644 --- a/office/scribus/scribus.SlackBuild +++ b/office/scribus/scribus.SlackBuild @@ -28,10 +28,19 @@ PRGNAM=scribus VERSION=1.3.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 @@ -46,6 +55,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