aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLeonid Bloch <leonid@daynix.com>2015-08-26 15:07:16 +0300
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-09-01 11:07:09 -0500
commitdecdfbd28d754f6ff596c0201ab55e9ff4df5b4e (patch)
tree874d3597a3ec9b1ee881e2a7c219df47b7d1839f /Makefile
parent848849dddf68630021351f5068de12f5c54ae2f8 (diff)
downloadqemu-decdfbd28d754f6ff596c0201ab55e9ff4df5b4e.zip
qemu-decdfbd28d754f6ff596c0201ab55e9ff4df5b4e.tar.gz
qemu-decdfbd28d754f6ff596c0201ab55e9ff4df5b4e.tar.bz2
qemu-ga: Fixed paths issue with MSI build
Previously, if building out-of-tree, the MSI build would fail since it wasn't able to find the needed files. Signed-off-by: Leonid Bloch <leonid@daynix.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> * fixed up commit msg formating Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9a4c3c6..f98a554 100644
--- a/Makefile
+++ b/Makefile
@@ -305,8 +305,8 @@ endif
$(QEMU_GA_MSI): config-host.mak
-$(QEMU_GA_MSI): qga/installer/qemu-ga.wxs
- $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" \
+$(QEMU_GA_MSI): $(SRC_PATH)/qga/installer/qemu-ga.wxs
+ $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \
wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<, " WIXL $@")
else
msi: