From 0617de4c1b60d340cf7b68af0b3e5b040d79231b Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <matteo.bernardini@sns.it>
Date: Sat, 29 May 2010 21:18:35 +0200
Subject: desktop/wmCalClock: miscellaneous cleanups

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/wmCalClock/wmCalClock.SlackBuild | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'desktop/wmCalClock/wmCalClock.SlackBuild')

diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild
index 6ce12001d4..bc068e5a62 100644
--- a/desktop/wmCalClock/wmCalClock.SlackBuild
+++ b/desktop/wmCalClock/wmCalClock.SlackBuild
@@ -7,10 +7,19 @@
 
 PRGNAM=wmCalClock
 VERSION=${VERSION:-1.25}
-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
@@ -42,7 +54,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-
 cd Src
   make \
     CFLAGS="$SLKCFLAGS" \
-- 
cgit v1.2.3