From d29226c5ae9b764787ad703eebb4b3554c5b9c12 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 00:59:26 -0400 Subject: [PATCH] academic/tuxtype2: Misc automated cleanups. Signed-off-by: David Somero --- academic/tuxtype2/tuxtype2.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/academic/tuxtype2/tuxtype2.SlackBuild b/academic/tuxtype2/tuxtype2.SlackBuild index 44d6d71cec..0d5bae1825 100644 --- a/academic/tuxtype2/tuxtype2.SlackBuild +++ b/academic/tuxtype2/tuxtype2.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=tuxtype2 VERSION=${VERSION:-1.5.3} -ARCH=${ARCH:-i486} BUILD=${BUILD:-2} 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