diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-05-18 02:42:46 +0200 |
|---|---|---|
| committer | Arnon Gilboa <agilboa@redhat.com> | 2013-05-19 09:19:58 +0300 |
| commit | 12e2d63604d689918c26baeeff78bd51ff46b924 (patch) | |
| tree | 163a81a3fad0a25b800ec393dccc12ec04f142c1 | |
| parent | 2e3a9998a189b3586f8a6ca62c403e87cf371641 (diff) | |
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | usbclerk.wxs.in | 4 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 3b73957..decbb80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,3 +12,11 @@ usbclerktest_SOURCES = usbclerktest.cpp EXTRA_DIST = usbclerk.wxs.in CONFIG_STATUS_DEPENDENCIES = usbclerk.wxs.in + +deps.txt: + $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ + +MANUFACTURER = The Spice Project + +usbclerk-$(WIXL_ARCH)-$(VERSION).msi: usbclerk.wxs deps.txt + MANUFACTURER="$(MANUFACTURER)" wixl --arch $(WIXL_ARCH) -o $@ $< diff --git a/configure.ac b/configure.ac index cb40a36..b59d81b 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,17 @@ AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror]) AM_MAINTAINER_MODE([enable]) +AC_CANONICAL_HOST + +case "$host" in + amd64*|x86_64*) + WIXL_ARCH="x64" + ;; + *) + WIXL_ARCH="x86" + ;; +esac +AC_SUBST(WIXL_ARCH) LT_INIT AC_PROG_CXX diff --git a/usbclerk.wxs.in b/usbclerk.wxs.in index f6f8140..fed7805 100644 --- a/usbclerk.wxs.in +++ b/usbclerk.wxs.in @@ -54,12 +54,16 @@ Remove="uninstall" Wait="yes"/> </Component> + <Component Id="CDepsTxt" Guid="be86cc16-bf4d-11e2-bbde-0024d71e178c"> + <File Id='depstxt' Name='deps.txt' DiskId='1' Source='deps.txt' KeyPath='yes'/> + </Component> </Directory> </Directory> </Directory> <Feature Id="Complete" Level="1"> <ComponentRef Id="CUSBClerk"/> + <ComponentRef Id="CDepsTxt"/> </Feature> </Product> |