summaryrefslogtreecommitdiffstats
path: root/academic
diff options
context:
space:
mode:
author David Somero2010-06-04 06:59:16 +0200
committer David Somero2010-06-04 06:59:16 +0200
commit73de4d4d660aa94b45df2299e4ed07db031f679e (patch)
tree02f8a15153bf0b8944a540b09c8883f8787e7cfa /academic
parent598f68b1df6c609a762b06b67259238154fe7e3d (diff)
downloadslackbuilds-73de4d4d660aa94b45df2299e4ed07db031f679e.tar.gz
academic/octave: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/octave/octave.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 107a2a4b65..32e2bfd11a 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM="octave"
VERSION=${VERSION:-3.2.4}
-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-$VERSION
@@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e