aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:44 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:44 -0400
commit799d6146312fec610c2512fc0589feb861dea18f (patch)
treeb5d8336e7ce72c8eca6ce8ad8d5470c7be6cd411 /system
parent379c475beeac25e37a0d210019fcf8bbeebe3657 (diff)
system/sash: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/sash/sash.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/sash/sash.SlackBuild b/system/sash/sash.SlackBuild
index ff54a030da607..942447d98dbb6 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