From 6f243e4cd959193ac5906db7713aa9f987b6397f Mon Sep 17 00:00:00 2001
From: David Somero <xgizzmo@slackbuilds.org>
Date: Fri, 4 Jun 2010 01:16:06 -0400
Subject: [PATCH] system/makepasswd: Misc automated cleanups.

Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
---
 system/makepasswd/makepasswd.SlackBuild | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/makepasswd/makepasswd.SlackBuild b/system/makepasswd/makepasswd.SlackBuild
index 3d74258106..df0c5043a3 100644
--- a/system/makepasswd/makepasswd.SlackBuild
+++ b/system/makepasswd/makepasswd.SlackBuild
@@ -6,10 +6,19 @@
 
 PRGNAM=makepasswd
 VERSION=${VERSION:-0.4.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) 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