From 1387e463e59a9bef75cc8d2c26e5927600f309b8 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@kde.org>
Date: Mon, 1 Sep 2014 15:52:31 +0200
Subject: Use KDE_INSTALL_USE_QT_SYS_PATHS to do the right thing automatically.
 and drop useless calls.

---
 datalib/kf5_flags                           | 4 +---
 perllib/Debian/Debhelper/Buildsystem/kf5.pm | 1 -
 qt-kde-team/3/debian-qt-kde.mk              | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/datalib/kf5_flags b/datalib/kf5_flags
index 287f837..a9aa075 100644
--- a/datalib/kf5_flags
+++ b/datalib/kf5_flags
@@ -1,6 +1,4 @@
 -DCMAKE_BUILD_TYPE=Debian
 -DCMAKE_USE_RELATIVE_PATHS=ON
--DCMAKE_INSTALL_QTPLUGINDIR=qt5/plugins
--DCMAKE_INSTALL_QTQUICKIMPORTSDIR=qt5/imports
--DCMAKE_INSTALL_QMLDIR=qt5/qml
 -DCMAKE_INSTALL_SYSCONFDIR=/etc
+-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
diff --git a/perllib/Debian/Debhelper/Buildsystem/kf5.pm b/perllib/Debian/Debhelper/Buildsystem/kf5.pm
index d7bbe68..0ffb779 100644
--- a/perllib/Debian/Debhelper/Buildsystem/kf5.pm
+++ b/perllib/Debian/Debhelper/Buildsystem/kf5.pm
@@ -44,7 +44,6 @@ sub get_kf5_flags {
 
     # Unescape flags using shell
     $flags = `$^X -w -Mstrict -e 'print join("\\x1e", \@ARGV);' -- $escaped_flags`;
-    $flags = $flags . "\x1e-DECM_MKSPECS_INSTALL_DIR=/usr/lib/" . dpkg_architecture_value('DEB_HOST_MULTIARCH') . "/qt5/mkspecs/modules/";
     return split("\x1e", $flags);
 }
 
diff --git a/qt-kde-team/3/debian-qt-kde.mk b/qt-kde-team/3/debian-qt-kde.mk
index 8a3aa15..09c290a 100644
--- a/qt-kde-team/3/debian-qt-kde.mk
+++ b/qt-kde-team/3/debian-qt-kde.mk
@@ -52,10 +52,6 @@ ifneq (,$(findstring yes, $(dqk_link_with_no_undefined)))
     endif
 endif
 
-# Since cmake 2.6.2 or higher is required from now on, enable relative paths to
-# get more ccache hits.
-$(call set_command_options,dh_auto_configure, += "-u-DCMAKE_USE_RELATIVE_PATHS=ON")
-
 # Run dh_sameversiondep
 run_dh_sameversiondep:
 	dh_sameversiondep
-- 
cgit v1.2.3