Browse Source

[bios] Move isolinux definitions to Makefile.pcbios

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 9 years ago
parent
commit
43515f9f1a
2 changed files with 22 additions and 22 deletions
  1. 0
    22
      src/arch/i386/Makefile
  2. 22
    0
      src/arch/i386/Makefile.pcbios

+ 0
- 22
src/arch/i386/Makefile View File

@@ -84,28 +84,6 @@ endif
84 84
 #
85 85
 CFLAGS_lkrnprefix	+= -DVERSION="\"$(VERSION)\""
86 86
 
87
-# Locations of isolinux files
88
-#
89
-SYSLINUX_DIR_LIST	:= \
90
-	/usr/lib/syslinux \
91
-	/usr/lib/syslinux/bios \
92
-	/usr/lib/syslinux/modules/bios \
93
-	/usr/share/syslinux \
94
-	/usr/share/syslinux/bios \
95
-	/usr/share/syslinux/modules/bios \
96
-	/usr/local/share/syslinux \
97
-	/usr/local/share/syslinux/bios \
98
-	/usr/local/share/syslinux/modules/bios \
99
-	/usr/lib/ISOLINUX
100
-ISOLINUX_BIN_LIST	:= \
101
-	$(ISOLINUX_BIN) \
102
-	$(patsubst %,%/isolinux.bin,$(SYSLINUX_DIR_LIST))
103
-LDLINUX_C32_LIST	:= \
104
-	$(LDLINUX_C32) \
105
-	$(patsubst %,%/ldlinux.c32,$(SYSLINUX_DIR_LIST))
106
-ISOLINUX_BIN	= $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
107
-LDLINUX_C32	= $(firstword $(wildcard $(LDLINUX_C32_LIST)))
108
-
109 87
 # i386-specific directories containing source files
110 88
 #
111 89
 SRCDIRS		+= arch/i386/core arch/i386/transitions arch/i386/prefix

+ 22
- 0
src/arch/i386/Makefile.pcbios View File

@@ -53,6 +53,28 @@ LIST_NAME_mrom := ROMS
53 53
 LIST_NAME_pcirom := ROMS
54 54
 LIST_NAME_isarom := ROMS
55 55
 
56
+# Locations of isolinux files
57
+#
58
+SYSLINUX_DIR_LIST	:= \
59
+	/usr/lib/syslinux \
60
+	/usr/lib/syslinux/bios \
61
+	/usr/lib/syslinux/modules/bios \
62
+	/usr/share/syslinux \
63
+	/usr/share/syslinux/bios \
64
+	/usr/share/syslinux/modules/bios \
65
+	/usr/local/share/syslinux \
66
+	/usr/local/share/syslinux/bios \
67
+	/usr/local/share/syslinux/modules/bios \
68
+	/usr/lib/ISOLINUX
69
+ISOLINUX_BIN_LIST	:= \
70
+	$(ISOLINUX_BIN) \
71
+	$(patsubst %,%/isolinux.bin,$(SYSLINUX_DIR_LIST))
72
+LDLINUX_C32_LIST	:= \
73
+	$(LDLINUX_C32) \
74
+	$(patsubst %,%/ldlinux.c32,$(SYSLINUX_DIR_LIST))
75
+ISOLINUX_BIN	= $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
76
+LDLINUX_C32	= $(firstword $(wildcard $(LDLINUX_C32_LIST)))
77
+
56 78
 # rule to make a non-emulation ISO boot image
57 79
 NON_AUTO_MEDIA	+= iso
58 80
 %iso:	%lkrn util/geniso

Loading…
Cancel
Save