diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-18 10:52:20 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-18 10:52:20 -0500 |
| commit | 164b90eedbd38f235811cd0990e532fec5da38b9 (patch) | |
| tree | bd0fe94d71c7bc392f99c73a187ac96be6103014 | |
| parent | 845051da88fc87a43a7d2d5de7cfa303a0f779fa (diff) | |
| download | slackbuilds-164b90eedbd38f235811cd0990e532fec5da38b9.tar.gz | |
office/abiword: Miscellaneous script cleanup.
| -rw-r--r-- | office/abiword/abiword.SlackBuild | 23 | ||||
| -rw-r--r-- | office/abiword/doinst.sh | 1 |
2 files changed, 15 insertions, 9 deletions
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild index 26dc192118..029db3c3a4 100644 --- a/office/abiword/abiword.SlackBuild +++ b/office/abiword/abiword.SlackBuild @@ -29,10 +29,19 @@ PRGNAM=abiword VERSION=2.8.4 DOCSVER=$VERSION # version of abiword-docs -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 @@ -41,18 +50,17 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi -# If libgsf is built with gio enabled, then use it (for later in -current) -# Otherwise, 13.0 does not have gio-enabled libgsf -[ ! -f "/usr/include/libgsf-1/gsf/gsf-input-gio.h" ] && USE_GIO="no" - set -e rm -rf $PKG @@ -91,7 +99,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-clipart \ --enable-templates \ --enable-plugins \ - --with-gio=${USE_GIO:-no} \ --build=$ARCH-slackware-linux make diff --git a/office/abiword/doinst.sh b/office/abiword/doinst.sh index 6c07a9fbbc..e87623941d 100644 --- a/office/abiword/doinst.sh +++ b/office/abiword/doinst.sh @@ -1,4 +1,3 @@ - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi |