summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:23 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:23 -0400
commit0fe44030192880a49ed13b895a0c3984400ae6d8 (patch)
treee62afedb37e7a2033106a8b1943a3cca42693fb3
parentb2bccb8b49e05caf187901f4c2585266b26b0de5 (diff)
downloadslackbuilds-0fe44030192880a49ed13b895a0c3984400ae6d8.tar.gz
system/conserver: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/conserver/conserver.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/conserver/conserver.SlackBuild b/system/conserver/conserver.SlackBuild
index ce985c2276..2155d664a6 100644
--- a/system/conserver/conserver.SlackBuild
+++ b/system/conserver/conserver.SlackBuild
@@ -9,10 +9,19 @@
PRGNAM=conserver
VERSION=8.1.17
-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
@@ -27,6 +36,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Bail out if we have a problem