aboutsummaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:54 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:54 -0400
commit677477232a8d20d7d81c0d1e480f7ee56d49f906 (patch)
tree27e75df1b25bf4e122e2052f5dc5b004fd7ba1cd /office
parent9c67dfc5dea7f7f486b79bce58575a1298376542 (diff)
office/pandoc: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/pandoc/pandoc.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild
index 9cce2501efae6..4c4c991505813 100644
--- a/office/pandoc/pandoc.SlackBuild
+++ b/office/pandoc/pandoc.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=pandoc
VERSION=${VERSION:-1.3}
-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
@@ -21,6 +30,9 @@ elif [ "$ARCH" = "i686" ]; then
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors