summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:34 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:34 -0400
commit6c7c02ff843bb501178bc4088c7ff5a8cc147f48 (patch)
tree32cb722d6c5d71cc6d5ba7f5bb4690a90181dbee
parent81aa598f6605874795d5ee5b8b9f10e7edfe9f60 (diff)
downloadslackbuilds-6c7c02ff843bb501178bc4088c7ff5a8cc147f48.tar.gz
system/pwsafe: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/pwsafe/pwsafe.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/pwsafe/pwsafe.SlackBuild b/system/pwsafe/pwsafe.SlackBuild
index 7ff34e42c5..f52cbffd57 100644
--- a/system/pwsafe/pwsafe.SlackBuild
+++ b/system/pwsafe/pwsafe.SlackBuild
@@ -6,10 +6,19 @@
APP=pwsafe
VERSION=0.2.0
-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
@@ -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