diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-11-18 13:46:37 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-11-19 16:05:16 +0100 |
| commit | a867579ce30b70ddb8a50807dd8e7c1770ff6166 (patch) | |
| tree | c6852632a7fad9599ba4aee89d36b1f4c1a8c1ad | |
| parent | b122d4154b464c5150875c0b1fccdf3fe9a97d1e (diff) | |
build: Put unversioned .exe installer in the ISO
While it makes sense to have a versioned .exe file when it's standalone,
when it's on an ISO, it's more natural to have an unversioned .exe
installer. This is achieved through the use of the --graft-points option
to mkisofs.
Change-Id: I1970348c6a72dcd44865c78d3348fc57766deb26
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -15,6 +15,8 @@ INSTALLER=spice-guest-tools-$(VERSION).exe INSTALL_NAME=spice-guest-tools-iso # ISO image filename ISO_IMAGE=SPICE-tools-$(DISPLAYED_VERSION).iso +# name of the installer on the ISO +ISO_INSTALLER_NAME=spice-guest-tools.exe # link also to this name which has no version ISO_GENERIC=SPICE-tools.iso # ISO image preparer and publisher @@ -26,6 +28,7 @@ ifeq ($(MODE),OVIRT) INSTALLER=ovirt-guest-tools-setup-$(VERSION).exe INSTALL_NAME=ovirt-guest-tools-iso ISO_IMAGE=oVirt-toolsSetup_$(DISPLAYED_VERSION).iso +ISO_INSTALLER_NAME=ovirt-guest-tools-setup.exe ISO_GENERIC=ovirt-tools-setup.iso ISO_P_TEXT=oVirt - KVM Virtualization Manager Project (www.ovirt.org) ISO_LABEL=oVirt-WGT-$(DISPLAYED_VERSION) @@ -135,7 +138,7 @@ endif iso: $(ISO_IMAGE) $(ISO_IMAGE): installer - mkisofs -J -rational-rock -full-iso9660-filenames -verbose -V "$(ISO_LABEL)" -preparer "$(ISO_P_TEXT)" -publisher "$(ISO_P_TEXT)" -o "$(ISO_IMAGE)" bin drivers $(INSTALLER) + mkisofs -J -rational-rock -full-iso9660-filenames -verbose -V "$(ISO_LABEL)" -preparer "$(ISO_P_TEXT)" -publisher "$(ISO_P_TEXT)" -o "$(ISO_IMAGE)" -graft-points bin drivers $(ISO_INSTALLER_NAME)=$(INSTALLER) install: iso mkdir -p "$(DESTDIR)$(INSTALL_DATA_DIR)" |