summaryrefslogtreecommitdiff
path: root/desktop/zenity
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-19 14:24:53 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:27:27 -0500
commit54857ddca6dfd181ed0af77860999da48adacd56 (patch)
tree1ca1e47aa57541f59c1fbe49e761f99747807618 /desktop/zenity
parent3096f945a567d1038cce0d9f4654f91ecb9ee1a3 (diff)
downloadslackbuilds-54857ddca6dfd181ed0af77860999da48adacd56.tar.gz
desktop/zenity: Miscellaneous cleanups.
Diffstat (limited to 'desktop/zenity')
-rw-r--r--desktop/zenity/README2
-rw-r--r--desktop/zenity/zenity.SlackBuild20
2 files changed, 16 insertions, 6 deletions
diff --git a/desktop/zenity/README b/desktop/zenity/README
index 81162dc0a5..5db098f647 100644
--- a/desktop/zenity/README
+++ b/desktop/zenity/README
@@ -2,4 +2,4 @@ Zenity is a tool that allows you to display Gtk+ dialog boxes from
the command line and through shell scripts. It is similar to
gdialog, but is intended to be saner.
-This requires libgnomecanvas and libnotify.
+This requires libgnomecanvas.
diff --git a/desktop/zenity/zenity.SlackBuild b/desktop/zenity/zenity.SlackBuild
index 489a3b148c..bd1af0b6fe 100644
--- a/desktop/zenity/zenity.SlackBuild
+++ b/desktop/zenity/zenity.SlackBuild
@@ -4,10 +4,19 @@
PRGNAM=zenity
VERSION=${VERSION:-2.24.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
@@ -22,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -55,10 +67,8 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING HACKING NEWS README THANKS TODO \