summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-26 22:07:40 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-26 23:57:57 -0500
commit662a654d419f2b813ad359837108e69945209ff8 (patch)
tree47f1bf6d76b1dd75685eb43a597399110249dd1c
parent70119f2c529d414ad061d3f731a99ba476e8e26c (diff)
downloadslackbuilds-662a654d419f2b813ad359837108e69945209ff8.tar.gz
network/vidalia: Miscellaneous cleanups
-rw-r--r--network/vidalia/vidalia.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/vidalia/vidalia.SlackBuild b/network/vidalia/vidalia.SlackBuild
index d5339ec870..94c230e83c 100644
--- a/network/vidalia/vidalia.SlackBuild
+++ b/network/vidalia/vidalia.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=vidalia
VERSION=${VERSION:-0.2.8}
-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