summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:56 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:56 -0400
commitdf3238badd237f0f0a2d156674ca04357b224921 (patch)
tree78512cce2b9388a4c2ab3ede5c7153e48c121f40
parent322c7f33e3584703027cec5893a90bc302ffb8a9 (diff)
downloadslackbuilds-df3238badd237f0f0a2d156674ca04357b224921.tar.gz
office/pstoedit: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--office/pstoedit/pstoedit.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/pstoedit/pstoedit.SlackBuild b/office/pstoedit/pstoedit.SlackBuild
index 7bbbd433e3..8d05eec01e 100644
--- a/office/pstoedit/pstoedit.SlackBuild
+++ b/office/pstoedit/pstoedit.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=pstoedit
VERSION=3.50
-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