2 files changed, 15 insertions, 3 deletions
diff --git a/desktop/xfce4-xkb-plugin/slack-desc b/desktop/xfce4-xkb-plugin/slack-desc
index c0082d1428399..982b769f4b1b9 100644
--- a/desktop/xfce4-xkb-plugin/slack-desc
+++ b/desktop/xfce4-xkb-plugin/slack-desc
@@ -7,7 +7,7 @@
 
       |-----handy-ruler------------------------------------------------------|
 xfce4-xkb-plugin: xfce4-xkb-plugin (xkb plugin for the Xfce panel)
-xfce4-xkb-plugin: 
+xfce4-xkb-plugin:
 xfce4-xkb-plugin: The xkb plugin can be used to show the current keyboard
 xfce4-xkb-plugin: layout and/or to select a layout from those defined in
 xfce4-xkb-plugin: the /etc/X11/xorg.conf file.
diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
index 9eca2284ac7c6..eecab91c1506f 100644
--- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
+++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-xkb-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-xkb-plugin
 VERSION=0.5.3.3
-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