diff options
Diffstat (limited to 'network/midori/midori.SlackBuild')
| -rw-r--r-- | network/midori/midori.SlackBuild | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index 3c9a606f70..9d0e08b6e5 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -1,9 +1,9 @@ #!/bin/sh -# Slackware build script for midori +# Slackware build script for midori. # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com> -# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> +# Copyright 2009-2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # # All rights reserved. # @@ -25,17 +25,15 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=midori -VERSION=0.2.2 +VERSION=0.2.6 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 ) ;; + *) ARCH=$( uname -m ) ;; esac fi @@ -49,6 +47,9 @@ DOCS="AUTHORS COPYING ChangeLog EXPAT HACKING INSTALL TODO TRANSLATE docs/user/m if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -93,7 +94,7 @@ export CXXFLAGS="$SLKCFLAGS" # Don't clobber existing configs mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new -mv $PKG/etc/midori/extensions/libadblock.so/config $PKG/etc/midori/extensions/libadblock.so/config.new +mv $PKG/etc/xdg/midori/extensions/libadblock.so/config $PKG/etc/xdg/midori/extensions/libadblock.so/config.new cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |