1 files changed, 19 insertions, 17 deletions
diff --git a/libraries/libmatroska/libmatroska.SlackBuild b/libraries/libmatroska/libmatroska.SlackBuild
index 52fbbbe5ef8d..df556ce3b6d0 100644
--- a/libraries/libmatroska/libmatroska.SlackBuild
+++ b/libraries/libmatroska/libmatroska.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libmatroska
-VERSION=1.3.0
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,33 +59,35 @@ fi
 
 set -e
 
-if [ "$STATICLIB" = "yes" ]; then
-  MAKESTATICLIB="staticlib"
-  MAKESTATICLIBINSTALL="install_staticlib"
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make -C make/linux $MAKESTATICLIB sharedlib \
-     prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX}
-make -C make/linux $MAKESTATICLIBINSTALL install_sharedlib install_headers \
-     prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX}
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --enable-static=${STATICLIB}
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION