diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-11-27 17:42:45 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-27 17:51:38 -0800 |
| commit | 586437df895fd3450e355e13cf986f2a8d8eac51 (patch) | |
| tree | bc1798889ac11fd20a79d73f98d5813c3211b16b /subsurface-install.pri | |
| parent | ca819b2a092af83ea6791a4fab0644aa57c42a1d (diff) | |
| download | subsurface-586437df895fd3450e355e13cf986f2a8d8eac51.tar.gz | |
Fix "make install" on Windows with srcdir != builddir
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 59690f256..4b06e176d 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -42,8 +42,8 @@ mac { # which libs we need. # The only target is "make install", which copies everything into packaging/windows WINDOWSSTAGING = packaging/windows - NSIFILE = $$WINDOWSSTAGING/subsurface.nsi - NSIINPUTFILE = $$WINDOWSSTAGING/subsurface.nsi.in + NSIFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi + NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in MAKENSIS = /usr/bin/makensis deploy.path = $$WINDOWSSTAGING @@ -65,8 +65,8 @@ mac { dlls.commands += perl $$PWD/scripts/win-ldd.pl # equals(QMAKE_HOST.os, "Windows"): EXE_SUFFIX = .exe EXE_SUFFIX = .exe - CONFIG(debug, debug|release): dlls.commands += $$PWD/debug/subsurface$$EXE_SUFFIX - else: dlls.commands += $$PWD/release/$$TARGET$$EXE_SUFFIX + CONFIG(debug, debug|release): dlls.commands += $$OUT_PWD/debug/subsurface$$EXE_SUFFIX + else: dlls.commands += $$OUT_PWD/release/$$TARGET$$EXE_SUFFIX for(plugin, $$list($$DEPLOYMENT_PLUGIN)) { CONFIG(debug, debug|release): dlls.depends += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll |