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

[Giovanni Scafora]

    Date: Monday, October 12, 2009 @ 22:01:31
  Author: giovanni
Revision: 55471

Modified:
  pyqt/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-13 00:01:09 UTC (rev 55470)
+++ PKGBUILD	2009-10-13 02:01:31 UTC (rev 55471)
@@ -6,9 +6,9 @@
 pkgname=pyqt
 pkgver=4.6.0
 _pkgver=4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of Python bindings for the Qt toolkit."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 depends=('sip>=4.9.0' 'qscintilla>=2.4.0' 'qt>=4.5.3' 'dbus-python' 'openssl')
 license=('GPL')
@@ -20,7 +20,7 @@
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
-
+  
   python configure.py --confirm-license -b /usr/bin \
   -d /usr/lib/python2.6/site-packages \
   -v /usr/share/sip
@@ -29,9 +29,7 @@
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
 
   make || return 1
-  make DESTDIR=${pkgdir} install
 
-  # FS#16599
-  install -d ${pkgdir}/usr/lib/qt/plugins/designer/
-  install -m755 libpythonplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/
-} 
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+}