newer versions of qemu have different binary names (per Joel Nider <joel@nider.org>)

diff --git a/Makefile b/Makefile
index 20cb884d0c8fde5420039c6a8a74ad6a7aa5af4c..dc94d824b0855f470b23c3f74c31425a951a31c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ OBJS = \
        vm.o\
 
 # Cross-compiling (e.g., on Mac OS X)
-#TOOLPREFIX = i386-jos-elf-
+# TOOLPREFIX = i386-jos-elf
 
 # Using native tools (e.g., on X86 Linux)
 #TOOLPREFIX = 
@@ -51,12 +51,14 @@ TOOLPREFIX := $(shell if i386-jos-elf-objdump -i 2>&1 | grep '^elf32-i386$$' >/d
 endif
 
 # If the makefile can't find QEMU, specify its path here
-#QEMU = 
+QEMU = qemu-system-i386
 
 # Try to infer the correct QEMU
 ifndef QEMU
 QEMU = $(shell if which qemu > /dev/null; \
        then echo qemu; exit; \
+       elif which qemu-system-i386 > /dev/null; \
+       then echo qemu-system-i386; exit; \
        else \
        qemu=/Applications/Q.app/Contents/MacOS/i386-softmmu.app/Contents/MacOS/i386-softmmu; \
        if test -x $$qemu; then echo $$qemu; exit; fi; fi; \