From 586437df895fd3450e355e13cf986f2a8d8eac51 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 27 Nov 2013 17:42:45 -0800 Subject: Fix "make install" on Windows with srcdir != builddir Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- subsurface-install.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'subsurface-install.pri') 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 -- cgit v1.2.3-70-g09d2