From d23266ad5119264b0e8c8de0d9edd76c491e0d84 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sun, 13 Oct 2013 16:20:31 +0300 Subject: subsurface-install.pri: attempt to fix the perl command line \$^ 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 Signed-off-by: Dirk Hohndel --- subsurface-install.pri | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'subsurface-install.pri') diff --git a/subsurface-install.pri b/subsurface-install.pri index eae2a661c..38b344387 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 -- cgit v1.2.3-70-g09d2