git » phonon.git » commit c68c22f

Better way

author Andrea Scarpino
2013-11-05 12:03:39 UTC
committer Andrea Scarpino
2013-11-05 12:03:39 UTC
parent 8dd6d20ebdf556c8fa1eeac1314ef5da634da467

Better way

PKGBUILD +4 -6

diff --git a/PKGBUILD b/PKGBUILD
index 2b306de..867a916 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,8 @@ build() {
     -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
@@ -33,7 +34,8 @@ build() {
     -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
 }
 
@@ -52,8 +54,6 @@ package_phonon-qt4(){
   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"
 }
@@ -65,6 +65,4 @@ package_phonon-qt5(){
 
   cd build-qt5
   make DESTDIR="${pkgdir}" install
-
-  [[ -d "${pkgdir}"/usr/lib64 ]] && mv "${pkgdir}"/usr/{lib64/*,lib}
 }