summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:37 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:37 -0400
commitc9508ecd41c16a96f4a394c40c2945f6f98fd561 (patch)
tree1d8ae70180ad9abb6d190018c7e03dc8cc334356
parent7e331cd135f82af7b060ff8855ae2d43ff207057 (diff)
downloadslackbuilds-c9508ecd41c16a96f4a394c40c2945f6f98fd561.tar.gz
office/apvlv: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--office/apvlv/apvlv.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/apvlv/apvlv.SlackBuild b/office/apvlv/apvlv.SlackBuild
index fcadb6783e..9d8f2c74c8 100644
--- a/office/apvlv/apvlv.SlackBuild
+++ b/office/apvlv/apvlv.SlackBuild
@@ -21,10 +21,19 @@
PRGNAM=apvlv
VERSION=${VERSION:-0.0.9.2}
-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
@@ -39,6 +48,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
DOCS="AUTHORS COPYING NEWS README THANKS TODO"