From 7729a4ef2e387dbe9d96787b40a4d1e65ea889db Mon Sep 17 00:00:00 2001
From: David Somero <xgizzmo@slackbuilds.org>
Date: Fri, 4 Jun 2010 01:17:17 -0400
Subject: system/yakuake: Misc automated cleanups.

Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
---
 system/yakuake/yakuake.SlackBuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'system/yakuake')

diff --git a/system/yakuake/yakuake.SlackBuild b/system/yakuake/yakuake.SlackBuild
index 357afea0b4..c0ea98539e 100644
--- a/system/yakuake/yakuake.SlackBuild
+++ b/system/yakuake/yakuake.SlackBuild
@@ -7,10 +7,19 @@
 
 PRGNAM=yakuake
 VERSION=2.9.6
-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
@@ -22,15 +31,12 @@ if [ $ARCH = "i486" ]; then
 elif [ $ARCH = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-elif [ $ARCH = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 elif [ $ARCH = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  echo "Unrecognized architecture type! Check the script: $0"
-  exit 1
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
-- 
cgit v1.2.3