From 6a411aa6c5c4dacea5539396dc58302896eac5b5 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Tue, 18 May 2010 14:44:22 -0500
Subject: desktop/xfswitch-plugin: Miscellaneous script cleanup.

---
 desktop/xfswitch-plugin/xfswitch-plugin.SlackBuild | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'desktop/xfswitch-plugin/xfswitch-plugin.SlackBuild')

diff --git a/desktop/xfswitch-plugin/xfswitch-plugin.SlackBuild b/desktop/xfswitch-plugin/xfswitch-plugin.SlackBuild
index 8961ba73870b0..1cf02f185a3da 100644
--- a/desktop/xfswitch-plugin/xfswitch-plugin.SlackBuild
+++ b/desktop/xfswitch-plugin/xfswitch-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfswitch-plugin
 
-# Copyright 2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2009,2010  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 
 PRGNAM=xfswitch-plugin
 VERSION=0.0.1
-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) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
-- 
cgit v1.2.3