From 5092be1d5bb25553897b6724735777ba7818f16e Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <matteo.bernardini@sns.it>
Date: Sat, 29 May 2010 21:29:04 +0200
Subject: desktop/wmweather: miscellaneous cleanups

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/wmweather/wmweather.SlackBuild | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'desktop/wmweather')

diff --git a/desktop/wmweather/wmweather.SlackBuild b/desktop/wmweather/wmweather.SlackBuild
index a6d5ee9714..8c86d39ea3 100644
--- a/desktop/wmweather/wmweather.SlackBuild
+++ b/desktop/wmweather/wmweather.SlackBuild
@@ -7,10 +7,19 @@
 
 PRGNAM=wmweather
 VERSION=${VERSION:-2.4.4}
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
-- 
cgit v1.2.3