From 7bd9af99cc9c3ec362f686cca811f7d366ce39a7 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <matteo.bernardini@sns.it>
Date: Sat, 29 May 2010 21:25:14 +0200
Subject: [PATCH] desktop/wmakerconf: miscellaneous cleanups

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

diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild
index 1741cf67d8..b6ea8d85fe 100644
--- a/desktop/wmakerconf/wmakerconf.SlackBuild
+++ b/desktop/wmakerconf/wmakerconf.SlackBuild
@@ -7,10 +7,19 @@
 
 PRGNAM=wmakerconf
 VERSION=${VERSION:-2.12}
-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