summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:38 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:38 -0400
commit4a467d75ab02014865a65415cfcf84990f998127 (patch)
tree53b3d825813ca9114a537bc849a7866000b26060
parent6d6b574cd9cc8a1f29571190b22abe59ab84f688 (diff)
downloadslackbuilds-4a467d75ab02014865a65415cfcf84990f998127.tar.gz
graphics/scrot: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--graphics/scrot/scrot.SlackBuild15
1 files changed, 14 insertions, 1 deletions
diff --git a/graphics/scrot/scrot.SlackBuild b/graphics/scrot/scrot.SlackBuild
index 305e01af13..c30c35cc9e 100644
--- a/graphics/scrot/scrot.SlackBuild
+++ b/graphics/scrot/scrot.SlackBuild
@@ -8,9 +8,19 @@ set -e
PRGNAM=scrot
VERSION=0.8
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -25,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