From 379bbf3088990554e6a1a672c4340b14e3e952f4 Mon Sep 17 00:00:00 2001
From: David Somero <xgizzmo@slackbuilds.org>
Date: Fri, 4 Jun 2010 01:16:13 -0400
Subject: [PATCH] system/nbench: Misc automated cleanups.

Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
---
 system/nbench/nbench.SlackBuild | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/system/nbench/nbench.SlackBuild b/system/nbench/nbench.SlackBuild
index 6852aff09d..db7b4bb193 100644
--- a/system/nbench/nbench.SlackBuild
+++ b/system/nbench/nbench.SlackBuild
@@ -7,11 +7,19 @@
 
 PRGNAM=nbench
 VERSION=${VERSION:-2.2.3}
-ARCH=${ARCH:-i486}
+SRCVERSION="byte-$VERSION"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION="byte-$VERSION"
+# 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}
@@ -27,15 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "s390" ]; then
+else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390x" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4"
-  LIBDIRSUFFIX=""
 fi
 
 set -e