diff options
author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:02:18 -0400 |
---|---|---|
committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:02:18 -0400 |
commit | b1f3cc8513dc7604701de2fb5fcebc467ac05c26 (patch) | |
tree | c3ec53cd92f4635e9e66460f5bc059ae7abd5a5c | |
parent | d7b5e15d6377de3c018e21fde4825a925abe6e59 (diff) | |
download | slackbuilds-b1f3cc8513dc7604701de2fb5fcebc467ac05c26.tar.gz |
desktop/xsession: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r-- | desktop/xsession/xsession.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/xsession/xsession.SlackBuild b/desktop/xsession/xsession.SlackBuild index d8a86d9737..34514f970c 100644 --- a/desktop/xsession/xsession.SlackBuild +++ b/desktop/xsession/xsession.SlackBuild @@ -8,10 +8,19 @@ PRGNAM=xsession VERSION=${VERSION:-1.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 @@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e # Exit on most errors |