1 files changed, 11 insertions, 8 deletions
diff --git a/audio/last.fm/last.fm.SlackBuild b/audio/last.fm/last.fm.SlackBuild
index 3328db50cb..b84f839e55 100644
--- a/audio/last.fm/last.fm.SlackBuild
+++ b/audio/last.fm/last.fm.SlackBuild
@@ -18,10 +18,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
@@ -40,23 +43,23 @@ patch -p1 < $CWD/patches/no-fingerprint-lib.diff
 patch -p1 < $CWD/patches/reduce-linkage.diff
 patch -p1 < $CWD/patches/volumeslider_h-qt45.patch
 
-lrelease-qt4 i18n/*.ts
+lrelease i18n/*.ts
 
-qmake-qt4 -config release
+qmake -config release INCLUDEPATH="/usr/lib${LIBDIRSUFFIX}/glib-2.0/include "
 
 make
 
 #Last.fm doesn't have a nice installer, so we need to package it manually.
-mkdir -p $PKG/usr/lib/$PRGNAM/i18n $PKG/usr/bin $PKG/usr/man/man1 \
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/i18n $PKG/usr/bin $PKG/usr/man/man1 \
  	 $PKG/usr/share/applications $PKG/usr/share/pixmaps
-cp -R bin/* $PKG/usr/lib/$PRGNAM
-cat $CWD/$PRGNAM.script > $PKG/usr/bin/$PRGNAM
+cp -R bin/* $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
+sed -e "s/@LIBDIR@/lib${LIBDIRSUFFIX}/" $CWD/$PRGNAM.script > $PKG/usr/bin/$PRGNAM
 chmod +x $PKG/usr/bin/$PRGNAM
-install -m 644 i18n/*.qm $PKG/usr/lib/$PRGNAM/i18n
+install -m 644 i18n/*.qm $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/i18n
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-( cd $PKG/usr/share/pixmaps ; ln -s ../../lib/last.fm/data/app_55.png lastfm.png )
+( cd $PKG/usr/share/pixmaps ; ln -s ../../lib${LIBDIRSUFFIX}/last.fm/data/app_55.png lastfm.png )
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -74,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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}