diff options
| author | Michael Brown | 2016-02-16 18:42:36 +0100 |
|---|---|---|
| committer | Michael Brown | 2016-02-16 20:32:32 +0100 |
| commit | 43515f9f1a3e3bfaa9171f4711ed0aafef1caf06 (patch) | |
| tree | cb209a4a84569ae08ce524a996dfac86a062d610 /src | |
| parent | [bios] Allow librm to be compiled for x86_64 (diff) | |
| download | ipxe-43515f9f1a3e3bfaa9171f4711ed0aafef1caf06.tar.gz ipxe-43515f9f1a3e3bfaa9171f4711ed0aafef1caf06.tar.xz ipxe-43515f9f1a3e3bfaa9171f4711ed0aafef1caf06.zip | |
[bios] Move isolinux definitions to Makefile.pcbios
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/i386/Makefile | 22 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.pcbios | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index 478e0634c..58915b8f9 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -84,28 +84,6 @@ endif # CFLAGS_lkrnprefix += -DVERSION="\"$(VERSION)\"" -# Locations of isolinux files -# -SYSLINUX_DIR_LIST := \ - /usr/lib/syslinux \ - /usr/lib/syslinux/bios \ - /usr/lib/syslinux/modules/bios \ - /usr/share/syslinux \ - /usr/share/syslinux/bios \ - /usr/share/syslinux/modules/bios \ - /usr/local/share/syslinux \ - /usr/local/share/syslinux/bios \ - /usr/local/share/syslinux/modules/bios \ - /usr/lib/ISOLINUX -ISOLINUX_BIN_LIST := \ - $(ISOLINUX_BIN) \ - $(patsubst %,%/isolinux.bin,$(SYSLINUX_DIR_LIST)) -LDLINUX_C32_LIST := \ - $(LDLINUX_C32) \ - $(patsubst %,%/ldlinux.c32,$(SYSLINUX_DIR_LIST)) -ISOLINUX_BIN = $(firstword $(wildcard $(ISOLINUX_BIN_LIST))) -LDLINUX_C32 = $(firstword $(wildcard $(LDLINUX_C32_LIST))) - # i386-specific directories containing source files # SRCDIRS += arch/i386/core arch/i386/transitions arch/i386/prefix diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index 02952f81b..8ae37399f 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -53,6 +53,28 @@ LIST_NAME_mrom := ROMS LIST_NAME_pcirom := ROMS LIST_NAME_isarom := ROMS +# Locations of isolinux files +# +SYSLINUX_DIR_LIST := \ + /usr/lib/syslinux \ + /usr/lib/syslinux/bios \ + /usr/lib/syslinux/modules/bios \ + /usr/share/syslinux \ + /usr/share/syslinux/bios \ + /usr/share/syslinux/modules/bios \ + /usr/local/share/syslinux \ + /usr/local/share/syslinux/bios \ + /usr/local/share/syslinux/modules/bios \ + /usr/lib/ISOLINUX +ISOLINUX_BIN_LIST := \ + $(ISOLINUX_BIN) \ + $(patsubst %,%/isolinux.bin,$(SYSLINUX_DIR_LIST)) +LDLINUX_C32_LIST := \ + $(LDLINUX_C32) \ + $(patsubst %,%/ldlinux.c32,$(SYSLINUX_DIR_LIST)) +ISOLINUX_BIN = $(firstword $(wildcard $(ISOLINUX_BIN_LIST))) +LDLINUX_C32 = $(firstword $(wildcard $(LDLINUX_C32_LIST))) + # rule to make a non-emulation ISO boot image NON_AUTO_MEDIA += iso %iso: %lkrn util/geniso |