From 022c68c97f0a4c3c2569e3b7f69aa0dd7589fd1c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Dec 2014 10:18:05 +0100 Subject: base the libexec fallback logic on the makespec this is consistent with the unix version. Change-Id: I84e15dd590b4ed9702f8a9dc0e8b655c930588d5 Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9b0193437f..b6de39d4a7 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3892,7 +3892,7 @@ void Configure::generateQConfigCpp() if (!dictionary["QT_INSTALL_ARCHDATA"].size()) dictionary["QT_INSTALL_ARCHDATA"] = qipempty ? "" : dictionary["QT_INSTALL_PREFIX"]; if (!dictionary["QT_INSTALL_LIBEXECS"].size()) { - if (dictionary["QT_INSTALL_ARCHDATA"] == dictionary["QT_INSTALL_PREFIX"]) + if (targSpec.startsWith("win")) dictionary["QT_INSTALL_LIBEXECS"] = qipempty ? "" : dictionary["QT_INSTALL_ARCHDATA"] + "/bin"; else dictionary["QT_INSTALL_LIBEXECS"] = qipempty ? "" : dictionary["QT_INSTALL_ARCHDATA"] + "/libexec"; -- cgit v1.2.3