summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:03:10 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:03:10 -0400
commitc471a2be8da7b0b03196f6e18e38682306374d46 (patch)
tree4e37a6fc1c6f9875b2b39505e725ea8a15937e52
parent7cd255147d25da529cd90cd3d595d05136835d1e (diff)
downloadslackbuilds-c471a2be8da7b0b03196f6e18e38682306374d46.tar.gz
development/nsis: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--development/nsis/nsis.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/development/nsis/nsis.SlackBuild b/development/nsis/nsis.SlackBuild
index 120817d261..2f5406d949 100644
--- a/development/nsis/nsis.SlackBuild
+++ b/development/nsis/nsis.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=nsis
VERSION=2.46
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e