summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:08 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:08 -0400
commit90180384c103402b567f173960e987212359d73d (patch)
tree4a089031d031285b51d441a9f2835d41a1148771
parentecc5c71d0f6fc1cfc939dc47912fb047941169bc (diff)
downloadslackbuilds-90180384c103402b567f173960e987212359d73d.tar.gz
slackbuilds-90180384c103402b567f173960e987212359d73d.tar.xz
system/whowatch: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/whowatch/whowatch.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/whowatch/whowatch.SlackBuild b/system/whowatch/whowatch.SlackBuild
index f65b114331..12db61279d 100644
--- a/system/whowatch/whowatch.SlackBuild
+++ b/system/whowatch/whowatch.SlackBuild
@@ -23,10 +23,19 @@
PRGNAM=whowatch
VERSION=${VERSION:-1.4}
-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
@@ -41,6 +50,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e