From 799d6146312fec610c2512fc0589feb861dea18f Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:16:44 -0400 Subject: system/sash: Misc automated cleanups. Signed-off-by: David Somero --- system/sash/sash.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/system/sash/sash.SlackBuild b/system/sash/sash.SlackBuild index ff54a030da..942447d98d 100644 --- a/system/sash/sash.SlackBuild +++ b/system/sash/sash.SlackBuild @@ -11,10 +11,19 @@ PRGNAM=sash VERSION=${VERSION:-3.7} -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 @@ -29,6 +38,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e # Exit on most errors -- cgit v1.2.3