diff options
| -rw-r--r-- | libraries/libmatroska/libmatroska.SlackBuild | 15 | ||||
| -rw-r--r-- | libraries/libmatroska/libmatroska.info | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libraries/libmatroska/libmatroska.SlackBuild b/libraries/libmatroska/libmatroska.SlackBuild index 5910f72524..6b5288732e 100644 --- a/libraries/libmatroska/libmatroska.SlackBuild +++ b/libraries/libmatroska/libmatroska.SlackBuild @@ -35,10 +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 @@ -60,16 +63,16 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make prefix=/usr sharedlib -C make/linux -make prefix=$PKG/usr install -C make/linux +make prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} sharedlib -C make/linux +make prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX} install -C make/linux ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) -# Add a documentation directory: - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ChangeLog LICENSE.LGPL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libmatroska/libmatroska.info b/libraries/libmatroska/libmatroska.info index f66349276f..cc617aa645 100644 --- a/libraries/libmatroska/libmatroska.info +++ b/libraries/libmatroska/libmatroska.info @@ -5,4 +5,4 @@ DOWNLOAD="http://dl.matroska.org/downloads/libmatroska/libmatroska-0.8.1.tar.bz2 MD5SUM="20cf624ace0c58a54c7752eebfbc0b19" MAINTAINER="Andrew Strong" EMAIL="andrew.david.45@gmail.com" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="dsomero,rworkman" |