summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero2010-06-04 07:03:02 +0200
committer David Somero2010-06-04 07:03:02 +0200
commit45e21a797265f18098c98d0c96e1f6f316aa2238 (patch)
tree480c1bbe4b21ed9a06e087fe933bc17963d0be3c
parent26ca44132518efeeb9f977f21257a3d0ae87ce0f (diff)
downloadslackbuilds-45e21a797265f18098c98d0c96e1f6f316aa2238.tar.gz
development/kdiff3: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--development/kdiff3/kdiff3.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild
index cc8fd63969..a1dd3a5481 100644
--- a/development/kdiff3/kdiff3.SlackBuild
+++ b/development/kdiff3/kdiff3.SlackBuild
@@ -23,10 +23,19 @@
PRGNAM=kdiff3
VERSION=${VERSION:-0.9.95}
-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
@@ -41,6 +50,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