[arch-commits] Commit in phonon/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Tuesday, November 5, 2013 @ 13:03:39
  Author: andrea
Revision: 198809

Better way

Modified:
  phonon/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-05 11:44:17 UTC (rev 198808)
+++ PKGBUILD	2013-11-05 12:03:39 UTC (rev 198809)
@@ -25,7 +25,8 @@
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
-    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 
   cd ../build-qt5
@@ -34,7 +35,8 @@
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
-    -DPHONON_BUILD_PHONON4QT5=ON
+    -DPHONON_BUILD_PHONON4QT5=ON \
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 }
 
@@ -53,8 +55,6 @@
   install -d "${pkgdir}"/usr/include/qt4
   mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
 
-  [[ -d "${pkgdir}"/usr/lib64 ]] && mv "${pkgdir}"/usr/{lib64/*,lib}
-
   sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
     "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
 }
@@ -66,6 +66,4 @@
 
   cd build-qt5
   make DESTDIR="${pkgdir}" install
-
-  [[ -d "${pkgdir}"/usr/lib64 ]] && mv "${pkgdir}"/usr/{lib64/*,lib}
 }