diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:11:09 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:11:09 -0400 |
| commit | d7411e1ebd59a3bfff29096241fa933d6a028213 (patch) | |
| tree | a039a54a4d5da75be7a069210d6ff66fc6d9218b | |
| parent | 5e9d6cf92fd21db3cdd3bbcbc92c8fbf368b1241 (diff) | |
| download | slackbuilds-d7411e1ebd59a3bfff29096241fa933d6a028213.tar.gz | |
misc/merkaartor: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rwxr-xr-x | misc/merkaartor/merkaartor.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/merkaartor/merkaartor.SlackBuild b/misc/merkaartor/merkaartor.SlackBuild index 07b716505a..6ea712c9df 100755 --- a/misc/merkaartor/merkaartor.SlackBuild +++ b/misc/merkaartor/merkaartor.SlackBuild @@ -7,10 +7,19 @@ PRGNAM=merkaartor VERSION=${VERSION:-0.15.3} -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 @@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |