diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:02:15 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:02:15 -0400 |
| commit | 05ec3ca2785c083c452c0925e19a2a892f2e1257 (patch) | |
| tree | 79cad237bdd0f8193fa902f3bb926caa9a692c4b | |
| parent | df3a9a9a901e605c4a0b7e171538a736afa06b78 (diff) | |
desktop/xmobar: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rwxr-xr-x | desktop/xmobar/xmobar.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/xmobar/xmobar.SlackBuild b/desktop/xmobar/xmobar.SlackBuild index ab7f8151f684f..69c9376d117d6 100755 --- a/desktop/xmobar/xmobar.SlackBuild +++ b/desktop/xmobar/xmobar.SlackBuild @@ -7,12 +7,21 @@ PRGNAM=xmobar VERSION=${VERSION:-0.9.2} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2) +# 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 @@ -27,6 +36,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 |