aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-24 10:46:21 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-24 10:46:21 -0500
commit23cb2d29429e796aec64370851c284dfa34311f8 (patch)
treeb020bd7c9e0af348582aed9a9392a98dfab94f26
parenteb7c90aa312001425060c0f55b546dd63b69ad05 (diff)
libraries/GConf: Miscellaneous cleanups.
-rw-r--r--libraries/GConf/GConf.SlackBuild16
-rw-r--r--libraries/GConf/slack-desc12
2 files changed, 20 insertions, 8 deletions
diff --git a/libraries/GConf/GConf.SlackBuild b/libraries/GConf/GConf.SlackBuild
index 51912059afa48..3b3c3f9d83326 100644
--- a/libraries/GConf/GConf.SlackBuild
+++ b/libraries/GConf/GConf.SlackBuild
@@ -25,10 +25,19 @@
PRGNAM=GConf
VERSION=2.26.0
-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
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -79,7 +91,7 @@ make install-strip DESTDIR=$PKG
mv $PKG/etc/gconf/2/path $PKG/etc/gconf/2/path.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s /usr/share/gtk-doc/html/gconf html )
diff --git a/libraries/GConf/slack-desc b/libraries/GConf/slack-desc
index 5afb530aa6f6b..3d3302987056e 100644
--- a/libraries/GConf/slack-desc
+++ b/libraries/GConf/slack-desc
@@ -11,9 +11,9 @@ GConf:
GConf: GConf is a system for storing application preferences.
GConf: It is intended for user preferences. GNOME desktop relies
GConf: on this package.
-GConf:
-GConf:
-GConf:
-GConf:
-GConf:
-GConf:
+GConf:
+GConf:
+GConf:
+GConf:
+GConf:
+GConf: