summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:06 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:06 -0400
commit6f243e4cd959193ac5906db7713aa9f987b6397f (patch)
treeeb019564bf8ea8e3b5d27cc0a112c184d3e7e785
parenta79ace4844155f9b7d9137e68a3d2eff82f7047e (diff)
downloadslackbuilds-6f243e4cd959193ac5906db7713aa9f987b6397f.tar.gz
system/makepasswd: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/makepasswd/makepasswd.SlackBuild14
1 files changed, 13 insertions, 1 deletions
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