summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:15 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:17:15 -0400
commit5872e83a7703ee9d9572846ee9c4ed2c585385a8 (patch)
tree213c0e3152fbe6883948f67a75981879984624c2
parent69ea69ff509779321cd3409f8ac16c817df1e96d (diff)
downloadslackbuilds-5872e83a7703ee9d9572846ee9c4ed2c585385a8.tar.gz
system/xrdp: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/xrdp/xrdp.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/xrdp/xrdp.SlackBuild b/system/xrdp/xrdp.SlackBuild
index 4a661f7ca5..f6f1f046a7 100644
--- a/system/xrdp/xrdp.SlackBuild
+++ b/system/xrdp/xrdp.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=xrdp
VERSION=0.4.1
-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