From 88b94900abade5c651190121b57ccc9b02cc86d9 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:01:13 -0400 Subject: desktop/matchbox-desktop: Misc automated cleanups. Signed-off-by: David Somero --- desktop/matchbox-desktop/matchbox-desktop.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'desktop/matchbox-desktop/matchbox-desktop.SlackBuild') diff --git a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild index c5d63d34efc1e..0c0c6c4ffdf58 100644 --- a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild +++ b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=matchbox-desktop VERSION=0.9.1 -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 @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e -- cgit v1.2.3