summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author David Somero2010-06-04 07:14:40 +0200
committer David Somero2010-06-04 07:14:40 +0200
commit679e966da766cdfdf998da20b21a3ff03876eb39 (patch)
tree9a2dca267c9a6a0f0cfc0f17695e69119ca341be /office
parent11d036cd24afa8448989cd4b6ed6664c96f32b5d (diff)
downloadslackbuilds-679e966da766cdfdf998da20b21a3ff03876eb39.tar.gz
office/catdoc: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/catdoc/catdoc.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/catdoc/catdoc.SlackBuild b/office/catdoc/catdoc.SlackBuild
index 0e536eace1..50412277e4 100644
--- a/office/catdoc/catdoc.SlackBuild
+++ b/office/catdoc/catdoc.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=catdoc
VERSION=${VERSION:-0.94.2}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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