aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:17 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:17 -0400
commit2df53d9d70ed84b2a1a5aec4fca6ec3af13987f9 (patch)
tree4f188e667276cca9226e2e98a637ebfce1e4ee38
parent1b9dcc80bd4a5941b219093cbc73012460fe802d (diff)
libraries/confuse: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/confuse/confuse.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/confuse/confuse.SlackBuild b/libraries/confuse/confuse.SlackBuild
index f6a2b5d4f9220..ab982c42d5f94 100644
--- a/libraries/confuse/confuse.SlackBuild
+++ b/libraries/confuse/confuse.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=confuse
VERSION=2.6
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
rm -rf $PKG