summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:33 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:33 -0400
commitb27110783579984937d028ffcee36a61cf5cd62d (patch)
treec19d528f2f82d5d648898bbea42626b26f85ec40 /libraries
parentb13f3c57fbfa9411a703de335cbc7b7b47f7ea1c (diff)
downloadslackbuilds-b27110783579984937d028ffcee36a61cf5cd62d.tar.gz
libraries/fltk2: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/fltk2/fltk2.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/fltk2/fltk2.SlackBuild b/libraries/fltk2/fltk2.SlackBuild
index b943ddea0c..e1f36995d2 100644
--- a/libraries/fltk2/fltk2.SlackBuild
+++ b/libraries/fltk2/fltk2.SlackBuild
@@ -27,13 +27,22 @@
PRGNAM=fltk2
VERSION=2.0.x_r6970
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRC_PRGNAM=fltk
SRC_VERSION=$(printf $VERSION | tr _ -)
+# 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
@@ -50,6 +59,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e