summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:33 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:33 -0400
commit81aa598f6605874795d5ee5b8b9f10e7edfe9f60 (patch)
tree3d47e28afddb425b58153e28eab741fa80d5dbfd
parent1ebe792a7ed850f11d575b11901f62c59bf28963 (diff)
downloadslackbuilds-81aa598f6605874795d5ee5b8b9f10e7edfe9f60.tar.gz
system/pwgen: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/pwgen/pwgen.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/pwgen/pwgen.SlackBuild b/system/pwgen/pwgen.SlackBuild
index 28e34b6e91..db144550c9 100644
--- a/system/pwgen/pwgen.SlackBuild
+++ b/system/pwgen/pwgen.SlackBuild
@@ -31,10 +31,19 @@
APP=pwgen
VERSION=2.06
-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-$APP
@@ -49,6 +58,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e