aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:00:57 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:00:57 -0400
commit8b68d96e02dec5938859477d5d4f19614a8e700f (patch)
tree44b6ede87d07239dcc3ce00112ed7d47822fe47c
parent78773886c137afd8a83e1aea7b3ff6f2d84c72c0 (diff)
desktop/cwp: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/cwp/cwp.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/cwp/cwp.SlackBuild b/desktop/cwp/cwp.SlackBuild
index 92d21f2a042b1..705618830d3ee 100644
--- a/desktop/cwp/cwp.SlackBuild
+++ b/desktop/cwp/cwp.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=cwp
VERSION=${VERSION:-1.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) 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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors