From c7ac53ba4462b8a6aa14c96e137516dfb23139f7 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:01:05 -0400 Subject: desktop/gtk-engines: Misc automated cleanups. Signed-off-by: David Somero --- desktop/gtk-engines/gtk-engines.SlackBuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/desktop/gtk-engines/gtk-engines.SlackBuild b/desktop/gtk-engines/gtk-engines.SlackBuild index 2161de3156..e21e965f20 100644 --- a/desktop/gtk-engines/gtk-engines.SlackBuild +++ b/desktop/gtk-engines/gtk-engines.SlackBuild @@ -21,10 +21,19 @@ PRGNAM=gtk-engines VERSION=${VERSION:-2.20.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 @@ -39,9 +48,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README" -- cgit v1.2.3