diff options
| author | Rohan Garg <rohan@kde.org> | 2014-08-20 18:17:18 +0200 |
|---|---|---|
| committer | Rohan Garg <rohan@kde.org> | 2014-08-21 14:29:43 +0200 |
| commit | 70ef4a82a846afdda6f6d2b956536986c79ee9c3 (patch) | |
| tree | 623e64b878543f8ee87ddbc89fb84e0f0f371c4b | |
| parent | 30b25428938c1c3f1b0025451c4c8ca135fc43b8 (diff) | |
| download | pkg-kde-tools-70ef4a82a846afdda6f6d2b956536986c79ee9c3.tar.gz | |
Make sure ECM_MKSPECS_INSTALL_DIR is also passed
| -rw-r--r-- | perllib/Debian/Debhelper/Buildsystem/kf5.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perllib/Debian/Debhelper/Buildsystem/kf5.pm b/perllib/Debian/Debhelper/Buildsystem/kf5.pm index b517587..c472b28 100644 --- a/perllib/Debian/Debhelper/Buildsystem/kf5.pm +++ b/perllib/Debian/Debhelper/Buildsystem/kf5.pm @@ -1,5 +1,5 @@ -# A debhelper build system class for building KDE 4 packages. -# It is based on cmake class but passes KDE 4 flags by default. +# A debhelper build system class for building KDE Frameworks 5 packages. +# It is based on cmake class but passes Frameworks 5 flags by default. # # Copyright: © 2009 Modestas Vainius # License: GPL-2+ @@ -8,7 +8,7 @@ package Debian::Debhelper::Buildsystem::kf5; use strict; use warnings; -use Debian::Debhelper::Dh_Lib qw(error); +use Debian::Debhelper::Dh_Lib qw(error dpkg_architecture_value); use Dpkg::Version qw(); use base 'Debian::Debhelper::Buildsystem::cmake'; @@ -44,6 +44,7 @@ sub get_kf5_flags { # Unescape flags using shell $flags = `$^X -w -Mstrict -e 'print join("\\x1e", \@ARGV);' -- $escaped_flags`; + $flags = $flags . " -DECM_MKSPECS_INSTALL_DIR=usr/lib/" . dpkg_architecture_value('DEB_HOST_MULTIARCH') . "/qt5/mkspecs/modules/"; return split("\x1e", $flags); } |