summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:18 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:18 -0400
commit656d94aefc767dea7c6755bd5c07149ff630b36a (patch)
treed6895c61fd8681a4185bf919f2153976cbaf1267 /system
parent5cc7eee2c694684654a09f4204d731176714b1b9 (diff)
downloadslackbuilds-656d94aefc767dea7c6755bd5c07149ff630b36a.tar.gz
system/chkconfig: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/chkconfig/chkconfig.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/chkconfig/chkconfig.SlackBuild b/system/chkconfig/chkconfig.SlackBuild
index bd7e002910..5b35a14525 100644
--- a/system/chkconfig/chkconfig.SlackBuild
+++ b/system/chkconfig/chkconfig.SlackBuild
@@ -10,10 +10,19 @@
PRGNAM=chkconfig
VERSION=${VERSION:-1.3.30c}
-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
@@ -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