summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:46 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:46 -0400
commitd3492fa4fb78ce5119707f6d4c1e2dbe2502d814 (patch)
tree200a40a309b39bc1485adc72c30d62fadc992d40
parentad1cd1262c54e50d8856a4fd09728db70be37065 (diff)
downloadslackbuilds-d3492fa4fb78ce5119707f6d4c1e2dbe2502d814.tar.gz
misc/ascii: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--misc/ascii/ascii.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/ascii/ascii.SlackBuild b/misc/ascii/ascii.SlackBuild
index 3f3e79919f..1633cec089 100644
--- a/misc/ascii/ascii.SlackBuild
+++ b/misc/ascii/ascii.SlackBuild
@@ -9,10 +9,19 @@
PRGNAM=ascii
VERSION=${VERSION:-3.8}
-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
@@ -27,6 +36,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e