1 files changed, 13 insertions, 1 deletions
diff --git a/graphics/xpe/xpe.SlackBuild b/graphics/xpe/xpe.SlackBuild
index b4e4c5ad69..deb3b5e0b3 100644
--- a/graphics/xpe/xpe.SlackBuild
+++ b/graphics/xpe/xpe.SlackBuild
@@ -8,7 +8,6 @@
 
 PRGNAM=xpe
 VERSION=0.9.5b
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -18,6 +17,16 @@ SRCPRGNAM=xpe_project
 # The Source tarball has a different version numbering
 SRCVERSION="v$(echo $VERSION | tr . _)"
 
+# 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
@@ -32,6 +41,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e