aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:19 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:01:19 -0400
commit71e5e267bfff6c0f8ff1cf717af6face18e0658e (patch)
tree6e6d7b0167ad5fdab912bbf1be26e3791f625b38
parent3b0526591c28e3f8a0f07f21c9d85c6b131627d4 (diff)
desktop/openbox: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/openbox/openbox.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild
index 399240e66472..ff1e76495f46 100644
--- a/desktop/openbox/openbox.SlackBuild
+++ b/desktop/openbox/openbox.SlackBuild
@@ -28,10 +28,19 @@
PRGNAM=openbox
VERSION=${VERSION:-3.4.11}
-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
@@ -60,6 +69,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e