summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:12 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:12 -0400
commit4b9bb8f555d257b9f9c4615e697d625c7797f158 (patch)
tree804c364c1cf5ceda3a88ac9124ccdcb67c3c1b33
parente1ed9516ee695898ab900e61608f72af3ada8cf3 (diff)
downloadslackbuilds-4b9bb8f555d257b9f9c4615e697d625c7797f158.tar.gz
slackbuilds-4b9bb8f555d257b9f9c4615e697d625c7797f158.tar.xz
system/xchm: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/xchm/xchm.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild
index e1bea64732..3ae982ce55 100644
--- a/system/xchm/xchm.SlackBuild
+++ b/system/xchm/xchm.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=xchm
VERSION=${VERSION:-1.14}
-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
@@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e