summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:18 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:18 -0400
commit3b0526591c28e3f8a0f07f21c9d85c6b131627d4 (patch)
treebc3f7d836dfcd40b5830055d863e434584644bd8
parent0be973e67fa7d038343e340bb21b5238cfd2e5ac (diff)
downloadslackbuilds-3b0526591c28e3f8a0f07f21c9d85c6b131627d4.tar.gz
desktop/odccm: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/odccm/odccm.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/odccm/odccm.SlackBuild b/desktop/odccm/odccm.SlackBuild
index b6b9b62e11..5aed8eb40d 100644
--- a/desktop/odccm/odccm.SlackBuild
+++ b/desktop/odccm/odccm.SlackBuild
@@ -4,10 +4,19 @@
PRGNAM=odccm
VERSION=${VERSION:-0.13}
-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
@@ -22,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors