diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 12:16:22 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 13:45:42 +0100 |
| commit | 894c81b75aa2ffc4eef3c56e4c72fe70c4080b99 (patch) | |
| tree | 37b5135e79a69a30e2eac3f81a17efdd4701a813 /com32/hdt/Makefile | |
| parent | 98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff) | |
| parent | ba42e1409ece2e9d56728e0ee6a6342c05ec6e52 (diff) | |
| download | syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.gz | |
Merge remote-tracking branch 'zytor/master' into merge/elflink/master
A lot of development has gone on in the 'master' branch since the last
time we merged; new features, bug fixes, etc, etc.
Conflicts:
Makefile
com32/Makefile
com32/lib/Makefile
com32/lib/syslinux/load_linux.c
com32/modules/Makefile
com32/modules/chain.c
core/bootsect.inc
core/init.inc
version
Diffstat (limited to 'com32/hdt/Makefile')
| -rw-r--r-- | com32/hdt/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile index 934ad25f..36206cd5 100644 --- a/com32/hdt/Makefile +++ b/com32/hdt/Makefile @@ -45,7 +45,7 @@ FLOPPY_DIR ?= floppy PCI_IDS_FILE ?= $(PWD)/$(FLOPPY_DIR)/pci.ids GZ_PCI_IDS_FILE ?= $(PCI_IDS_FILE).gz MENU_COM32 ?= $(com32)/menu/menu.c32 -CHAIN_COM32 ?= $(com32)/modules/chain.c32 +CHAIN_COM32 ?= $(com32)/chain/chain.c32 ART_DIR ?= art/ QEMU ?= qemu-kvm @@ -110,10 +110,16 @@ hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin $(FLOPPY_DIR)/hdt.cfg memtest mv hdt.iso hdt-$(VERSION).iso ln -sf hdt-$(VERSION).iso hdt.iso -release: spotless hdt.c32 hdt.img hdt.img.gz hdt.iso +hdt-hybrid.iso: hdt.iso ../../utils/isohybrid + cp hdt-$(VERSION).iso hdt-hybrid-$(VERSION).iso + ../../utils/isohybrid --partok hdt-hybrid-$(VERSION).iso + ln -sf hdt-hybrid-$(VERSION).iso hdt-hybrid.iso + +release: spotless hdt.c32 hdt.img hdt.img.gz hdt.iso hdt-hybrid.iso mv hdt.c32 hdt_$(NODASH_VERSION).c32 md5sum hdt_$(NODASH_VERSION).c32 >$(SUM_FILE) md5sum hdt-$(VERSION).iso >>$(SUM_FILE) + md5sum hdt-hybrid-$(VERSION).iso >>$(SUM_FILE) md5sum hdt-$(VERSION).img >>$(SUM_FILE) md5sum hdt-$(VERSION).img.gz >>$(SUM_FILE) |