summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:02:54 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:02:54 -0400
commitbcb1ebcab83ce2cb9810a2045aa487ff461483ff (patch)
tree26888e418ac4e59ddada0de5bf6ad940fbfee3a0
parentf5ed863889facb0ff0a3e617728c200bb62763d4 (diff)
downloadslackbuilds-bcb1ebcab83ce2cb9810a2045aa487ff461483ff.tar.gz
slackbuilds-bcb1ebcab83ce2cb9810a2045aa487ff461483ff.tar.xz
development/happy: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--development/happy/happy.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/development/happy/happy.SlackBuild b/development/happy/happy.SlackBuild
index d33ae870b1..5e66a10daf 100644
--- a/development/happy/happy.SlackBuild
+++ b/development/happy/happy.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=happy
VERSION=${VERSION:-1.18.4}
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e