From f6e1da5cbf70a372f2b622c8021c98503cab8323 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 1 Sep 2015 20:58:28 +0100
Subject: [build] Search for ldlinux.c32 separately from isolinux.bin

Some distributions (observed with Ubuntu 15.04) place ldlinux.c32 in a
separate directory from isolinux.bin.  Search for these files
separately, and allow an alternative location of ldlinux.c32 to be
provided via LDLINUX_C32=... on the make command line.

Reported-by: Adrian Koshka <adriankoshcha@teknik.io>
Tested-by: Adrian Koshka <adriankoshcha@teknik.io>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/util/geniso | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/util')

diff --git a/src/util/geniso b/src/util/geniso
index 521c929e1..ff090d4a0 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -123,8 +123,7 @@ case "${LEGACY}" in
 		cp ${ISOLINUX_BIN} ${dir}
 
 		# syslinux 6.x needs a file called ldlinux.c32
-		LDLINUX_C32=$(dirname ${ISOLINUX_BIN})/ldlinux.c32
-		if [ -s ${LDLINUX_C32} ]; then
+		if [ -n "${LDLINUX_C32}" -a -s "${LDLINUX_C32}" ]; then
 			cp ${LDLINUX_C32} ${dir}
 		fi
 
-- 
cgit v1.2.3-55-g7522