summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:26 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:26 -0400
commit832caa682e2d077ef15dc572eccc002766250fed (patch)
tree1e0d72b7a9bb09bd8ca8deec94c5b5d791b07383
parent8754a1703b5bd9df391632f8800108a4c26bad21 (diff)
downloadslackbuilds-832caa682e2d077ef15dc572eccc002766250fed.tar.gz
slackbuilds-832caa682e2d077ef15dc572eccc002766250fed.tar.xz
graphics/kphotoalbum: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--graphics/kphotoalbum/kphotoalbum.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild
index 239082c22b..abba1c7124 100644
--- a/graphics/kphotoalbum/kphotoalbum.SlackBuild
+++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=kphotoalbum
VERSION=${VERSION:-4.1.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
@@ -27,6 +36,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors