From e24fd76b872b0c83d054ffeb4d9f48803bae8c1a Mon Sep 17 00:00:00 2001
From: David Somero <xgizzmo@slackbuilds.org>
Date: Fri, 4 Jun 2010 01:12:02 -0400
Subject: multimedia/tovid: Misc automated cleanups.

Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
---
 multimedia/tovid/tovid.SlackBuild | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'multimedia/tovid')

diff --git a/multimedia/tovid/tovid.SlackBuild b/multimedia/tovid/tovid.SlackBuild
index 523a76a8d38e..05246302e0d6 100755
--- a/multimedia/tovid/tovid.SlackBuild
+++ b/multimedia/tovid/tovid.SlackBuild
@@ -17,25 +17,36 @@
 
 PRGNAM=tovid
 VERSION=0.31
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Set up build environment
+# 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
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ] ; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-	LIBDIRSUFFIX=""
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ] ; then
-	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-	LIBDIRSUFFIX=""
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ] ; then
-	SLKCFLAGS="-O2 -fPIC"
-	LIBDIRSUFFIX="64"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
-- 
cgit v1.2.3