From 3dfcc044359351f54d5f4c5f6797ccfd6a4890d2 Mon Sep 17 00:00:00 2001 From: Uri Lublin Date: Mon, 16 Dec 2019 15:08:09 +0200 Subject: MSI: Make SourceDir the path to executables Make it possible to not put the executables under bin/ Signed-off-by: Uri Lublin Acked-by: Frediano Ziglio --- Makefile.am | 3 +-- spice-vdagent.wxs.in | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index f661445..138f479 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,8 +119,7 @@ spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs all make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ MANUFACTURER="$(MANUFACTURER)" PRODUCT="$(PRODUCT)" \ INSTALLDIRECTORY="$(PRODUCT)" BINDIRECTORY=bin \ - wixl -D SourceDir=$(prefix) \ - -D DESTDIR=$$DESTDIR$(prefix) \ + wixl -D SourceDir=$$DESTDIR$(prefix)/bin \ --arch $(WIXL_ARCH) -o $@ $< msi: spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in index 7650d67..d4314db 100644 --- a/spice-vdagent.wxs.in +++ b/spice-vdagent.wxs.in @@ -46,10 +46,10 @@ - + - +