[PATCH 3/7] Fix deployment: make isn't expanding $(DESTDIR_TARGET) for me
Thiago Macieira
thiago at macieira.org
Fri Oct 11 11:05:39 UTC 2013
I don't know why. Working around the issue by using $^ (all
dependencies) and listing the files to be processed as dependencies for
the rule.
Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
subsurface-install.pri | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/subsurface-install.pri b/subsurface-install.pri
index 12da7e1..9d67415 100644
--- a/subsurface-install.pri
+++ b/subsurface-install.pri
@@ -55,16 +55,16 @@ 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 $(DESTDIR_TARGET)
+ dlls.commands += perl $$PWD/scripts/win-ldd.pl \$^
for(plugin, $$list($$DEPLOYMENT_PLUGIN)) {
- CONFIG(debug, debug|release): dlls.commands += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll
- else: dlls.commands += $$[QT_INSTALL_PLUGINS]/$${plugin}4.dll
+ CONFIG(debug, debug|release): dlls.depends += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll
+ else: dlls.depends += $$[QT_INSTALL_PLUGINS]/$${plugin}4.dll
}
dlls.commands += $$LIBS
dlls.commands += | while read name; do $(INSTALL_FILE) \$\$name $$PWD/$$WINDOWSSTAGING; done
- dlls.depends = $(DESTDIR_TARGET)
+ dlls.depends += $(DESTDIR_TARGET)
install.depends += dlls
}
} else {
--
1.7.11.7
More information about the subsurface
mailing list