From a8f037a275886ed533bb0c005bc5464757f76ca7 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 13 May 2014 18:38:52 +0200 Subject: [build] Merge util/geniso and util/genliso Rework geniso and genliso to provide a single merged utility for generating ISO images. Modified-by: Michael Brown Signed-off-by: Michael Brown --- src/arch/i386/Makefile.pcbios | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index d3fe8b9e6..50e93144b 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -49,13 +49,13 @@ LIST_NAME_mrom := ROMS NON_AUTO_MEDIA += iso %iso: %lkrn util/geniso $(QM)$(ECHO) " [GENISO] $@" - $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $< + $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -o $@ $< # rule to make a floppy emulation ISO boot image NON_AUTO_MEDIA += liso -%liso: %lkrn util/genliso - $(QM)$(ECHO) " [GENLISO] $@" - $(Q)bash util/genliso $@ $< +%liso: %lkrn util/geniso + $(QM)$(ECHO) " [GENISO] $@" + $(Q)VERSION="$(VERSION)" bash util/geniso -l -o $@ $< # rule to make a syslinux floppy image (mountable, bootable) NON_AUTO_MEDIA += sdsk -- cgit v1.2.3-55-g7522