summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:02:59 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:02:59 -0400
commitd3f2f5c542306f31aa26360289ad8f18b27caa3e (patch)
tree28c87c959136566fce933c17cc2cb1f0fc56eec5
parente4d837b8ed25e1757a11db66a0520f101c1ed937 (diff)
downloadslackbuilds-d3f2f5c542306f31aa26360289ad8f18b27caa3e.tar.gz
slackbuilds-d3f2f5c542306f31aa26360289ad8f18b27caa3e.tar.xz
development/icoutils: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--development/icoutils/icoutils.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/development/icoutils/icoutils.SlackBuild b/development/icoutils/icoutils.SlackBuild
index 57086e1633..b94bdefb55 100644
--- a/development/icoutils/icoutils.SlackBuild
+++ b/development/icoutils/icoutils.SlackBuild
@@ -26,10 +26,19 @@
PRGNAM=icoutils
VERSION=0.26.0
-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
set -e