aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-20 12:50:15 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:13:11 -0500
commit381f32dc1d5f0c1ab68627f013452b3b78c71615 (patch)
tree949444400ac45eb2bf89a390903b36d7d3094fa9
parent76989c2b6431a31cdbf1da8262d7b07d40849504 (diff)
desktop/xfce4-genmon-plugin: Miscellaneous cleanups.
-rw-r--r--desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild16
1 files changed, 14 insertions, 2 deletions
diff --git a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild
index c7b089789989..fb9657cb4467 100644
--- a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild
+++ b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xfce4-genmon-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-genmon-plugin
VERSION=3.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