aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:32 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:32 -0400
commited7733e6b0c66e9c90c4381e0451f2e833e20bb8 (patch)
treed0b5448627aee7366efcf19de2b9d59d33b3d60a
parenta03eecd37d0ad4152f7cfb7cb0efbf066f4ecdf6 (diff)
system/proj: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/proj/proj.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/proj/proj.SlackBuild b/system/proj/proj.SlackBuild
index 676e7d3586bc8..84d934434347f 100644
--- a/system/proj/proj.SlackBuild
+++ b/system/proj/proj.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=proj
VERSION=${VERSION:-4.6.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) 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-$VERSION
@@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e