aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:15 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:15 -0400
commit74b4f6eb2df08698bfb01ccccf46d1b9c045da29 (patch)
tree5143bfb1514afe5f64786f1b2a14193c8e1ce658
parent5e67fefbb780b62a9842a19645c256e47176d3ca (diff)
system/ccd2iso: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/ccd2iso/ccd2iso.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/ccd2iso/ccd2iso.SlackBuild b/system/ccd2iso/ccd2iso.SlackBuild
index 19c454d990cd..f80e7a8deace 100644
--- a/system/ccd2iso/ccd2iso.SlackBuild
+++ b/system/ccd2iso/ccd2iso.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=ccd2iso
VERSION=${VERSION:-0.3}
-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
@@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e