summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:49 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:49 -0400
commit31c0647cd69238d7c8931a8f371d3a79ee36f67f (patch)
treebad0e8ec05c5712ae2fadc0d3428521c22687024 /office
parent8031b05510cccded21c185916e1818de1b9a9945 (diff)
downloadslackbuilds-31c0647cd69238d7c8931a8f371d3a79ee36f67f.tar.gz
slackbuilds-31c0647cd69238d7c8931a8f371d3a79ee36f67f.tar.xz
office/keepnote: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/keepnote/keepnote.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/office/keepnote/keepnote.SlackBuild b/office/keepnote/keepnote.SlackBuild
index a42afaf6d1..dfccadbb2d 100644
--- a/office/keepnote/keepnote.SlackBuild
+++ b/office/keepnote/keepnote.SlackBuild
@@ -25,10 +25,19 @@
PRGNAM=keepnote
VERSION=0.6.1
-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
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors