From 7a24c1df4f70562d700a7a3879240175e0d4cca0 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:16:16 -0400 Subject: system/numlockx: Misc automated cleanups. Signed-off-by: David Somero --- system/numlockx/numlockx.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3