1 files changed, 11 insertions, 4 deletions
diff --git a/desktop/kcometen4/kcometen4.SlackBuild b/desktop/kcometen4/kcometen4.SlackBuild
index 3c25dc2d0a..d4c1c5b0ff 100644
--- a/desktop/kcometen4/kcometen4.SlackBuild
+++ b/desktop/kcometen4/kcometen4.SlackBuild
@@ -22,14 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
-
 PRGNAM=kcometen4
 VERSION=1.0.6
-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
@@ -44,7 +51,7 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "s390" ]; then
+else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi