summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-20 12:57:02 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:14:34 -0500
commit75223b79e6345213387abdc356e8242ea5440a1e (patch)
tree5dc699494fa8d672663331a3720e1b94120d9959
parent5b40a9d875273630d3cb88f1f0d01f43a590f6dc (diff)
downloadslackbuilds-75223b79e6345213387abdc356e8242ea5440a1e.tar.gz
desktop/xfce4-systemload-plugin: Miscellaneous cleanups.
-rw-r--r--desktop/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild16
1 files changed, 14 insertions, 2 deletions
diff --git a/desktop/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/desktop/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
index 89bd5198dc..6ac9ea4d2e 100644
--- a/desktop/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
+++ b/desktop/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xfce4-systemload-plugin
-# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
PRGNAM=xfce4-systemload-plugin
VERSION=0.4.2
-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) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export 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