summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:02 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:02 -0400
commit098837a028cafb0580ba1cc4d8d072f4be0a600f (patch)
tree54b7d15ff3f7ce690c6ce5cc85f47f9effc547b3
parent3da550b5078b951c0f01990c0b60636a46df2a26 (diff)
downloadslackbuilds-098837a028cafb0580ba1cc4d8d072f4be0a600f.tar.gz
system/usbmon: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/usbmon/usbmon.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/usbmon/usbmon.SlackBuild b/system/usbmon/usbmon.SlackBuild
index 8eec7295bf..274586da57 100644
--- a/system/usbmon/usbmon.SlackBuild
+++ b/system/usbmon/usbmon.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=usbmon
VERSION=${VERSION:-5.4}
-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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e