diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-10-11 11:05:39 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-11 12:05:22 -0700 |
| commit | fa532f0f28e250de904ffe329bb44a6260a529cf (patch) | |
| tree | ad9e0fa887ad135c5fd54d63e12bfac736a27066 /subsurface-install.pri | |
| parent | c684df497677ee69251ca552a209da8895f55396 (diff) | |
| download | subsurface-fa532f0f28e250de904ffe329bb44a6260a529cf.tar.gz | |
Fix deployment: make isn't expanding $(DESTDIR_TARGET) for me
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@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 12da7e1ce..9d674153f 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 { |