From c292f1dc8a7e3ca64db9478465ffc7013bbfa4ac Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Aug 2012 21:45:58 +0200 Subject: respect copy_dir_files with manually flagged directories as well otherwise the second installation on unix would be bogus. Change-Id: I162533ee262c6820e7e2d4710b5342cafecd9d59 Reviewed-by: Joerg Bornemann --- qmake/generators/makefile.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'qmake/generators') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4cfcf35cb8..3025a5cefe 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1270,9 +1270,11 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n QString cmd; if (installConfigValues.contains("directory")) { cmd = QLatin1String("-$(INSTALL_DIR)"); - if (!dst_file.endsWith(Option::dir_sep)) - dst_file += Option::dir_sep; - dst_file += fi.fileName(); + if (project->isActiveConfig("copy_dir_files")) { + if (!dst_file.endsWith(Option::dir_sep)) + dst_file += Option::dir_sep; + dst_file += filestr; + } } else if (installConfigValues.contains("executable")) { cmd = QLatin1String("-$(INSTALL_PROGRAM)"); } else { -- cgit v1.2.3