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

[Andrea Scarpino]

    Date: Saturday, March 1, 2014 @ 09:18:29
  Author: andrea
Revision: 206539

Fix build

Modified:
  qwtplot3d/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-01 08:16:33 UTC (rev 206538)
+++ PKGBUILD	2014-03-01 08:18:29 UTC (rev 206539)
@@ -17,13 +17,14 @@
           '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
           '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
+prepare() {
+    cd ${pkgname}
+    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
+    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
+}
+
 build() {
-    . /etc/profile.d/qt4.sh
-
-    cd ${srcdir}/${pkgname}
-    patch -p1 < ../qwtplot3d-gcc44.patch
-    patch -p1 < ../qwtplot3d-qt-4.8.0.patch
-
+    cd ${pkgname}
     # build qwt:
     qmake qwtplot3d.pro
     make
@@ -30,20 +31,20 @@
 }
 
 package() {
-    cd ${srcdir}/${pkgname}
+    cd ${pkgname}
 
     # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
-    install -d ${pkgdir}/usr/{include/qwtplot3d,lib}
+    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
 
     for n in include/* ; do
-     cp -d $n ${pkgdir}/usr/include/qwtplot3d
+     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
     done
 
     for n in lib/libqwtplot3d.so* ; do
-     cp -d $n ${pkgdir}/usr/lib
+     cp -d $n "${pkgdir}"/usr/lib
     done
 
     # install custom license
-    install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE
+    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }