diff options
Diffstat (limited to 'source/l/djvulibre')
| -rwxr-xr-x | source/l/djvulibre/djvulibre.SlackBuild | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source/l/djvulibre/djvulibre.SlackBuild b/source/l/djvulibre/djvulibre.SlackBuild index 9d2f6762..706e45ef 100755 --- a/source/l/djvulibre/djvulibre.SlackBuild +++ b/source/l/djvulibre/djvulibre.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -40,8 +40,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -67,11 +67,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# The qt stuff really isn't needed here, as the viewer won't build -# with qt4 (and djview4 is now a separate package). -# It won't matter, as we only need the headers and libs -# anyway for okular to use, so ignore the warnings... :) - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -82,11 +77,9 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --with-qt=/usr/lib${LIBDIRSUFFIX}/qt \ --build=$ARCH-slackware-linux make clean || exit 1 -make depend || exit 1 make || exit 1 # This isn't fully compatible with threaded make make install DESTDIR=$PKG || exit 1 |