From 4b54bac210454ec2310d38bf64d88961dcd61784 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Thu, 20 May 2010 12:37:00 -0500 Subject: desktop/xfce4-datetime-plugin: Miscellaneous cleanups. --- .../xfce4-datetime-plugin.SlackBuild | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild index 9c3f8ce4cb..7219829ff0 100644 --- a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild +++ b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=xfce4-datetime-plugin VERSION=${VERSION:-0.6.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) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export 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 @@ -50,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ -- cgit v1.2.3