diff options
| -rw-r--r-- | libraries/libmatchbox/libmatchbox.SlackBuild | 16 | ||||
| -rw-r--r-- | libraries/libmatchbox/libmatchbox.info | 2 | ||||
| -rw-r--r-- | libraries/libmatchbox/slack-desc | 4 |
3 files changed, 16 insertions, 6 deletions
diff --git a/libraries/libmatchbox/libmatchbox.SlackBuild b/libraries/libmatchbox/libmatchbox.SlackBuild index 80042edd59..ab2f218415 100644 --- a/libraries/libmatchbox/libmatchbox.SlackBuild +++ b/libraries/libmatchbox/libmatchbox.SlackBuild @@ -35,8 +35,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e # Exit on most errors @@ -54,22 +59,25 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-pango \ --enable-jpeg \ - --enable-doxygen-docs + --enable-doxygen-docs \ + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libmatchbox/libmatchbox.info b/libraries/libmatchbox/libmatchbox.info index 9bf0dace65..37daf74c4c 100644 --- a/libraries/libmatchbox/libmatchbox.info +++ b/libraries/libmatchbox/libmatchbox.info @@ -3,6 +3,8 @@ VERSION="1.9" HOMEPAGE="http://projects.o-hand.com/matchbox/" DOWNLOAD="http://projects.o-hand.com/matchbox/sources/libmatchbox/1.9/libmatchbox-1.9.tar.bz2" MD5SUM="9f73e7515cc4679171a5db180dc1343b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Daniel de Kok" EMAIL="danieldk@pobox.com" APPROVED="BP{k}" diff --git a/libraries/libmatchbox/slack-desc b/libraries/libmatchbox/slack-desc index 811173ce9e..0eecf6fde2 100644 --- a/libraries/libmatchbox/slack-desc +++ b/libraries/libmatchbox/slack-desc @@ -14,6 +14,6 @@ libmatchbox: handhelds and set-top boxes. This package contains the Matchbox libmatchbox: application library that provides support functions for the libmatchbox: Matchbox window manager and applications. libmatchbox: -libmatchbox: The Matchbox homepage can be found at: -libmatchbox: http://projects.o-hand.com/matchbox/ +libmatchbox: +libmatchbox: Homepage: http://projects.o-hand.com/matchbox/ libmatchbox: |