aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMatteo Bernardini <matteo.bernardini@sns.it>2010-05-29 19:00:20 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-06-01 01:01:59 -0500
commit1a46c5a8c0fc9ca06ded8108441e7d43c4977052 (patch)
tree16729b0249876f7fbda3d1f6158f3da2f5eb811b /multimedia
parent8fa0be7d27a52807bbae8ed85b3270d0e40e20cb (diff)
multimedia/mjpegtools: miscellaneous cleanups
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mjpegtools/mjpegtools.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index 86d7b3e8790b..e2566c373a81 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=mjpegtools
VERSION=1.9.0
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-3}
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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e