summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:56 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:56 -0400
commite8112e19e21d12e72747ce3eb1a9811bbc13f6fb (patch)
tree6421311ddade9114b5b54faa44d751eea5ec787e
parent1f259ce629acc600e318bc7e43077d151c22e299 (diff)
downloadslackbuilds-e8112e19e21d12e72747ce3eb1a9811bbc13f6fb.tar.gz
slackbuilds-e8112e19e21d12e72747ce3eb1a9811bbc13f6fb.tar.xz
misc/g15daemon: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--misc/g15daemon/g15daemon.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/g15daemon/g15daemon.SlackBuild b/misc/g15daemon/g15daemon.SlackBuild
index 8c244bc825..74eac4150b 100644
--- a/misc/g15daemon/g15daemon.SlackBuild
+++ b/misc/g15daemon/g15daemon.SlackBuild
@@ -26,10 +26,19 @@
PRGNAM=g15daemon
VERSION=${VERSION:-1.9.5.3}
-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
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e