summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMatteo Bernardini <matteo.bernardini@sns.it>2010-05-29 21:26:44 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-06-01 01:01:59 -0500
commit82b07434ca4ac2cf813a6b81ab34df8f8658e260 (patch)
treeea4fb4af3d4698c23d33fe8ca36aeed64b2c2171 /desktop
parent7bd9af99cc9c3ec362f686cca811f7d366ce39a7 (diff)
downloadslackbuilds-82b07434ca4ac2cf813a6b81ab34df8f8658e260.tar.gz
desktop/wminfo: miscellaneous cleanups
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/wminfo/wminfo.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/wminfo/wminfo.SlackBuild b/desktop/wminfo/wminfo.SlackBuild
index 06231c679b..34ee8f5887 100644
--- a/desktop/wminfo/wminfo.SlackBuild
+++ b/desktop/wminfo/wminfo.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=wminfo
VERSION=${VERSION:-1.51}
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e