[PATCH 2/3] subsurface-install.pri: attempt to fix the perl command line

Lubomir I. Ivanov neolit123 at gmail.com
Sun Oct 13 06:20:31 UTC 2013


From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

\$^ or $(DESTDIR_TARGET) do not expand for some reason,
but also we cannot use $$DESTDIR, $$TARGET, or $$DESTDIR_TARGET
because these are empty. So what we use is a hardcoded path
(debug/release) and a target with an .exe suffix on win32.

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
i don't think this is also suitable for the cross build. what
happens again here is that passing make variables into the perl
command line do not expand *at all*.

on the other hand it appears that all the recommended qmake variables
like $$TARGET are empty, so we have to figure a way to pass
the correct target in there.
---
 subsurface-install.pri | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/subsurface-install.pri b/subsurface-install.pri
index eae2a66..38b3443 100644
--- a/subsurface-install.pri
+++ b/subsurface-install.pri
@@ -57,7 +57,10 @@ mac {
     !win32-msvc* {
         #!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$$QMAKE_CC -dumpmachine`-objdump
         dlls.commands += PATH=\$\$PATH:`$$QMAKE_CC -print-search-dirs | sed -nE \'/^libraries: =/{s///;s,/lib/?(:|\$\$),/bin\\1,g;p;q;}\'`
-        dlls.commands += perl $$PWD/scripts/win-ldd.pl \$^
+        dlls.commands += perl $$PWD/scripts/win-ldd.pl
+        equals(QMAKE_HOST.os, "Windows"): EXE_SUFFIX = .exe
+        CONFIG(debug, debug|release): dlls.commands += $$PWD/debug/subsurface$$EXE_SUFFIX
+        else: dlls.commands += $$PWD/release/$$TARGET$$EXE_SUFFIX
 
         for(plugin, $$list($$DEPLOYMENT_PLUGIN)) {
             CONFIG(debug, debug|release): dlls.depends += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll
-- 
1.7.11.msysgit.0



More information about the subsurface mailing list