summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2012-02-07 15:28:55 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-29 17:47:51 +0100
commitb37ff9aa49569782aa000f04bd0ad24aa0dfad47 (patch)
tree7a5d284c2f6171e28dfc387143a4115352b7e5d8
parent23439b7f2ce84661d8fd5800aabfbfd46014dd63 (diff)
Create target pkgconfig dir in qmake generated Windows Makefiles
(cherry picked from qtbase commit cbf8f03cf4f3b0aa49c9f35c9ae0e3304f142ac7) Change-Id: Icea70987ee3c6040ca3ba278a578849cb74156f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--qmake/generators/win32/winmakefile.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index f692b49fad..2536648b1a 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -846,6 +846,12 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
QString dst_pc = pkgConfigFileName(false);
if (!dst_pc.isEmpty()) {
dst_pc = filePrefixRoot(root, targetdir + dst_pc);
+ const QString dst_pc_dir = fileInfo(dst_pc).path();
+ if (!dst_pc_dir.isEmpty()) {
+ if (!ret.isEmpty())
+ ret += "\n\t";
+ ret += mkdir_p_asstring(dst_pc_dir, true);
+ }
if(!ret.isEmpty())
ret += "\n\t";
const QString replace_rule("QMAKE_PKGCONFIG_INSTALL_REPLACE");