summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:38 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:38 -0400
commit0bf465217e3481554e75523cdb697cd64895d175 (patch)
tree40994c581e4b1b0b19b51b0d76d2177698fb8f5f
parentebfb19098a22eaf13007510483558913acc63ac1 (diff)
downloadslackbuilds-0bf465217e3481554e75523cdb697cd64895d175.tar.gz
libraries/libpaper: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/libpaper/libpaper.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libpaper/libpaper.SlackBuild b/libraries/libpaper/libpaper.SlackBuild
index 0d2bf165cb..2531f567d7 100644
--- a/libraries/libpaper/libpaper.SlackBuild
+++ b/libraries/libpaper/libpaper.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=libpaper
VERSION=${VERSION:-1.1.23+nmu1}
-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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
# Set default papersize: a3, a4, a5, b5, letter, legal, executive, note, 11x17