From: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Date: Mon, 29 Mar 2010 00:12:06 +0000 (+0200)
Subject: [build] Look for isolinux.bin in more places
X-Git-Tag: v1.20.1~2715
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9feb7b38a5d38fd1dcf431b8ff2139d5d7afd90f;p=thirdparty%2Fipxe.git

[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>
---

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index dd8da8025..4f6869493 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
 #