summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-24 10:56:54 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-24 10:56:54 -0500
commitf3284e49455452d91790063d7248726112a99f0d (patch)
treeaa3fc461f2c64260051a7c1c677793d6542e6eb4
parent23cb2d29429e796aec64370851c284dfa34311f8 (diff)
downloadslackbuilds-f3284e49455452d91790063d7248726112a99f0d.tar.gz
desktop/QtCurve-Gtk2: Miscellaneous cleanups.
-rw-r--r--desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild15
1 files changed, 14 insertions, 1 deletions
diff --git a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
index 0248264499..f38db6f30e 100644
--- a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
+++ b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
@@ -2,6 +2,7 @@
# Slackware build script for QtCurve-Gtk2
# Written by bughunter2 (bughunter2@googlemail.com)
+
# Copyright 2008-2009 Michiel van Wessem, Manchester, United Kingdom
# Copyright 2009 Gregory J. L. Tourte, UK (artourter@gmail.com)
# All rights reserved.
@@ -27,10 +28,19 @@
PRGNAM=QtCurve-Gtk2
VERSION=${VERSION:-1.3.0}
-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
@@ -45,6 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e