aboutsummaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:47 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:47 -0400
commit5db08dcd572230ea01ea86b35586c96be6e2f6e4 (patch)
treea8a28a6f61710bb0792c34a7afe7766c2a01778f /office
parent78a41b9defaf4baccbb9eda769153ace03da5114 (diff)
office/htmldoc: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/htmldoc/htmldoc.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild
index 6ac4ae7e1761d..8d8fb16161240 100644
--- a/office/htmldoc/htmldoc.SlackBuild
+++ b/office/htmldoc/htmldoc.SlackBuild
@@ -27,10 +27,19 @@
PRGNAM=htmldoc
VERSION=1.8.27
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-3}
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
@@ -47,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
rm -rf $PKG