summaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:48 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:48 -0400
commita135a603d6a2122033c9f1a52f82d965839d47ff (patch)
tree3373cbcf360ef2a31a1c817235857c9208e33626 /office
parent5db08dcd572230ea01ea86b35586c96be6e2f6e4 (diff)
downloadslackbuilds-a135a603d6a2122033c9f1a52f82d965839d47ff.tar.gz
office/kchmviewer: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/kchmviewer/kchmviewer.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/kchmviewer/kchmviewer.SlackBuild b/office/kchmviewer/kchmviewer.SlackBuild
index 1ba6620cea..2a15d116b3 100644
--- a/office/kchmviewer/kchmviewer.SlackBuild
+++ b/office/kchmviewer/kchmviewer.SlackBuild
@@ -25,10 +25,19 @@
PRGNAM=kchmviewer
VERSION=${VERSION:-5.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
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e