summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:16 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:16 -0400
commit7a24c1df4f70562d700a7a3879240175e0d4cca0 (patch)
treec2b10959a58cebfa0dbeed57b26f48b4eed2aa3f
parent5e519ceee30da0f2a078515afca7ddaf44efddf7 (diff)
downloadslackbuilds-7a24c1df4f70562d700a7a3879240175e0d4cca0.tar.gz
system/numlockx: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/numlockx/numlockx.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/numlockx/numlockx.SlackBuild b/system/numlockx/numlockx.SlackBuild
index bf574a8fda..ddadac9826 100644
--- a/system/numlockx/numlockx.SlackBuild
+++ b/system/numlockx/numlockx.SlackBuild
@@ -10,10 +10,19 @@
PRGNAM=numlockx
VERSION=${VERSION:-1.1}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -28,6 +37,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