summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPiotr Jaroszyński2010-03-29 02:12:06 +0200
committerMarty Connor2010-04-16 13:49:29 +0200
commit9feb7b38a5d38fd1dcf431b8ff2139d5d7afd90f (patch)
tree51d711a142873b573530d0543779e4c921c64f63 /src
parent[drivers] Fix warnings identified by gcc 4.5 (diff)
downloadipxe-9feb7b38a5d38fd1dcf431b8ff2139d5d7afd90f.tar.gz
ipxe-9feb7b38a5d38fd1dcf431b8ff2139d5d7afd90f.tar.xz
ipxe-9feb7b38a5d38fd1dcf431b8ff2139d5d7afd90f.zip
[build] Look for isolinux.bin in more places
Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com> Signed-off-by: Marty Connor <mdc@etherboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index dd8da802..4f686949 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -69,7 +69,11 @@ CFLAGS += -Ui386
# Locations of utilities
#
-ISOLINUX_BIN = /usr/lib/syslinux/isolinux.bin
+ISOLINUX_BIN_LIST := \
+ $(ISOLINUX_BIN) \
+ /usr/lib/syslinux/isolinux.bin \
+ /usr/share/syslinux/isolinux.bin
+ISOLINUX_BIN = $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
# i386-specific directories containing source files
#