diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-11-17 17:40:30 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-11-19 14:31:44 +0100 |
| commit | 0a974a56b9b1c012c498e01013df571305a8f891 (patch) | |
| tree | f6449c996a38472dbdccc77018fa823e8ebd628e | |
| parent | 0609a989678bdccd29c370ae6fc3e82a8de30617 (diff) | |
build: Remove need for ISO_ROOT
We can pass directly the name of the files we want to be in the iso.
Change-Id: I6c5d2ae82a23ae4ba1d0249b6aefc61ccbc5b0a6
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -13,7 +13,7 @@ INSTALLER=spice-guest-tools-$(VERSION).exe # 'make install' target (in /usr/share) INSTALL_NAME=spice-guest-tools-iso # ISO image filename -ISO_IMAGE=SPICE-tools_$(DISPLAYED_VERSION).iso +ISO_IMAGE=SPICE-tools-$(DISPLAYED_VERSION).iso # link also to this name which has no version ISO_GENERIC=SPICE-tools.iso # ISO image preparer and publisher @@ -34,7 +34,6 @@ endif endif TEMP_DIR=temp_dir -ISO_ROOT=$(TEMP_DIR)/iso # common dependencies/sources @@ -135,9 +134,7 @@ endif iso: $(ISO_IMAGE) $(ISO_IMAGE): installer - mkdir -p "$(ISO_ROOT)" - $(RSYNC_AH) "$(INSTALLER)" bin drivers "$(ISO_ROOT)" - mkisofs -J -rational-rock -full-iso9660-filenames -verbose -V "$(ISO_LABEL)" -preparer "$(ISO_P_TEXT)" -publisher "$(ISO_P_TEXT)" -o "$(ISO_IMAGE)" "$(ISO_ROOT)" + 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) install: iso mkdir -p "$(DESTDIR)$(INSTALL_DATA_DIR)" |