diff options
| author | Uri Lublin <uril@redhat.com> | 2019-12-16 15:08:09 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2020-03-19 16:41:21 +0000 |
| commit | 3dfcc044359351f54d5f4c5f6797ccfd6a4890d2 (patch) | |
| tree | d014ad6d7d64cb761eef4746244ca4f645b2136e | |
| parent | 638a49aafea37f817d3321ac644600cf3bcfccc2 (diff) | |
MSI: Make SourceDir the path to executables
Make it possible to not put the executables under bin/
Signed-off-by: Uri Lublin <uril@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | 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 @@ <Directory Id="INSTALLDIR" Name="$(env.INSTALLDIRECTORY)"> <Directory Id="Dbindir" Name="$(env.BINDIRECTORY)"> <Component Id="CSpiceAgent" Guid="*" Win64="$(var.Win64)"> - <File Id='spiceagent' Name='vdagent.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdagent.exe' KeyPath='yes'/> + <File Id='spiceagent' Name='vdagent.exe' DiskId='1' Source='vdagent.exe' KeyPath='yes'/> </Component> <Component Id="CSpiceService" Guid="*" Win64="$(var.Win64)"> - <File Id='spiceservice' Name='vdservice.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdservice.exe' KeyPath='yes'/> + <File Id='spiceservice' Name='vdservice.exe' DiskId='1' Source='vdservice.exe' KeyPath='yes'/> <ServiceInstall Id="ServiceInstall" Name="spice-agent" DisplayName="$(env.PRODUCT)" |