From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 29 Aug 2011 14:55:36 +0000 (-0500)
Subject: Rename qemu -> qemu-system-i386
X-Git-Tag: v1.0-rc0~362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9aed1e036dc0de49d08d713f9e5c4655e94acb56;p=thirdparty%2Fqemu.git

Rename qemu -> qemu-system-i386

This has been discussed before in the past.  The special casing really makes no
sense anymore.  This seems like a good change to make for 1.0.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/Makefile b/Makefile
index 13be25a3820..e0cf51a8bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -366,9 +366,8 @@ tar:
 	rm -rf /tmp/$(FILE)
 
 SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS))
-SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \
-             $(patsubst %-softmmu,qemu-system-%, \
-             $(SYSTEM_TARGETS)))
+SYSTEM_PROGS=$(patsubst %-softmmu,qemu-system-%, \
+             $(SYSTEM_TARGETS))
 
 USER_TARGETS=$(filter %-user,$(TARGET_DIRS))
 USER_PROGS=$(patsubst %-bsd-user,qemu-%, \
diff --git a/Makefile.target b/Makefile.target
index 25c16d7f166..0787758ad63 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -27,12 +27,8 @@ ifdef CONFIG_USER_ONLY
 QEMU_PROG=qemu-$(TARGET_ARCH2)
 else
 # system emulator name
-ifeq ($(TARGET_ARCH), i386)
-QEMU_PROG=qemu$(EXESUF)
-else
 QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
 endif
-endif
 
 PROGS=$(QEMU_PROG)
 STPFILES=