From 8b810b7d2a5e4b50c4f5788f60b0aa6a30481a4a Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 00:58:58 -0400 Subject: academic/gcompris: Misc automated cleanups. Signed-off-by: David Somero --- academic/gcompris/gcompris.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/academic/gcompris/gcompris.SlackBuild b/academic/gcompris/gcompris.SlackBuild index 667d4005de..436d6d7b60 100644 --- a/academic/gcompris/gcompris.SlackBuild +++ b/academic/gcompris/gcompris.SlackBuild @@ -34,10 +34,19 @@ PRGNAM=gcompris VERSION=8.4.12 -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 @@ -52,6 +61,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