aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:02 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:02 -0400
commitf9fcc4eda484a36fe350ff65a5aa624b6623d099 (patch)
tree370859fe942343b5f70f307de6067a135ee227de
parent3219f5cbe212a43766d70c6f180a56a925ba2268 (diff)
office/xpad: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--office/xpad/xpad.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/xpad/xpad.SlackBuild b/office/xpad/xpad.SlackBuild
index 3d9bf1dd18f7f..5878e7268d0eb 100644
--- a/office/xpad/xpad.SlackBuild
+++ b/office/xpad/xpad.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=xpad
VERSION=${VERSION:-3.0}
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e