[PATCH] i386/x86-64: Fix isoimage when syslinux is in /usr/share

It's like this on SUSE systems.

Cc: hpa@zytor.com
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index 33e55476381b..e97946626064 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -109,8 +109,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf
 isoimage: $(BOOTIMAGE)
         -rm -rf $(obj)/isoimage
         mkdir $(obj)/isoimage
-        cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \
-                $(obj)/isoimage
+        for i in lib lib64 share end ; do \
+                if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \
+                        cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \
+                        break ; \
+                fi ; \
+                if [ $$i = end ] ; then exit 1 ; fi ; \
+        done
         cp $(BOOTIMAGE) $(obj)/isoimage/linux
         echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg
         if [ -f '$(FDINITRD)' ] ; then \