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

[Antonio Rojas]

    Date: Saturday, October 1, 2016 @ 08:25:33
  Author: arojas
Revision: 277486

Install binaries to the standard location

Modified:
  qt5-declarative/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-01 08:14:10 UTC (rev 277485)
+++ PKGBUILD	2016-10-01 08:25:33 UTC (rev 277486)
@@ -5,7 +5,7 @@
 pkgname=qt5-declarative
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,6 +13,7 @@
 depends=('qt5-xmlpatterns')
 makedepends=('python2' 'cmake')
 groups=('qt' 'qt5')
+conflicts=('qtchooser')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-declarative-gcc6.patch)
 md5sums=('0d9e461aa54dba4793253fa2eb501f9b'
@@ -41,10 +42,9 @@
   cd build
   make INSTALL_ROOT="$pkgdir" install
 
-  # Useful symlinks
-  install -d "$pkgdir"/usr/bin
-  for b in "$pkgdir"/usr/lib/qt/bin/*; do
-    ln -s /usr/lib/qt/bin/$(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
+  # Symlinks for backwards compatibility
+  for b in "$pkgdir"/usr/bin/*; do
+    ln -s /usr/bin/$(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
   done
 
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir