[bios] Move isolinux definitions to Makefile.pcbios

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 478e0634c7947422716faf2cf311827f07889356..58915b8f9c9e2837a775a4faf5c7e3ec320f15ea 100644 (file)
--- 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 02952f81b55e8a6448ac29802eb64155ccd1d64d..8ae37399f4426a10fd06252380a279879f92fef6 100644 (file)
--- 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