3 files changed, 21 insertions, 10 deletions
diff --git a/desktop/thunar-vcs-plugin/doinst.sh b/desktop/thunar-vcs-plugin/doinst.sh
index 922f8a99be..1f8ff67ded 100644
--- a/desktop/thunar-vcs-plugin/doinst.sh
+++ b/desktop/thunar-vcs-plugin/doinst.sh
@@ -8,4 +8,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
-
diff --git a/desktop/thunar-vcs-plugin/slack-desc b/desktop/thunar-vcs-plugin/slack-desc
index 74ba0ca0d6..14f7e9a58e 100644
--- a/desktop/thunar-vcs-plugin/slack-desc
+++ b/desktop/thunar-vcs-plugin/slack-desc
@@ -7,13 +7,13 @@
 
                  |-----handy-ruler-----------------------------------------------------|
 thunar-vcs-plugin: thunar-vcs-plugin (Version Control System plugin for Thunar)
-thunar-vcs-plugin: 
+thunar-vcs-plugin:
 thunar-vcs-plugin: The Thunar VCS Plugin adds Git and Subversion actions to the 
 thunar-vcs-plugin: context menu of thunar.
-thunar-vcs-plugin: 
-thunar-vcs-plugin: 
-thunar-vcs-plugin: 
-thunar-vcs-plugin: 
-thunar-vcs-plugin: 
-thunar-vcs-plugin: 
-thunar-vcs-plugin: 
+thunar-vcs-plugin:
+thunar-vcs-plugin:
+thunar-vcs-plugin:
+thunar-vcs-plugin:
+thunar-vcs-plugin:
+thunar-vcs-plugin:
+thunar-vcs-plugin:
diff --git a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
index b1663f78a3..5f35bb55c7 100644
--- a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
+++ b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=thunar-vcs-plugin
 VERSION=0.1.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