From f8d888548f6c4bd88e3274432c0ebd111c50d03b Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:14:41 -0400 Subject: [PATCH] office/cups-pdf: Misc automated cleanups. Signed-off-by: David Somero --- office/cups-pdf/cups-pdf.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/office/cups-pdf/cups-pdf.SlackBuild b/office/cups-pdf/cups-pdf.SlackBuild index 78fcb508b0..0262aaaf37 100644 --- a/office/cups-pdf/cups-pdf.SlackBuild +++ b/office/cups-pdf/cups-pdf.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=cups-pdf VERSION=2.5.0 -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 @@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG