[Qemu-devel] [PATCH v2] Rename qemu into qemu-system-i386 and install a compat symlink

[Aurelien Jarno]

This is the second version of the patch. Changes from previous version:
- use rm + ln -s instead of ln -sf as suggested by Blue Swirl.
- don't create the compatibility symlink on WIN32 as suggested by Jamie
  Lokier.

---

For historical reasons, qemu system on i386 is called qemu instead of
qemu-system-i386. This seems to confuse users.

This patch installs it as qemu-system-i386, and create a compatibility
symlink qemu -> qemu-system-i386 as some tools may call it that way.
We can change or remove this symlink after a few releases when all the
tools have migrated to this new name.

Signed-off-by: Aurelien Jarno <address@hidden>
---
 Makefile.target |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index b27696a..87e5ddf 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -63,12 +63,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)
 
@@ -746,6 +742,12 @@ install: all
 ifneq ($(PROGS),)
        $(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)"
 endif
+ifndef CONFIG_WIN32
+ifeq ($(TARGET_ARCH), i386)
+       rm -f "$(DESTDIR)$(bindir)/qemu$(EXESUF)"
+       ln -s qemu-system-i386$(EXESUF) "$(DESTDIR)$(bindir)/qemu$(EXESUF)"
+endif
+endif
 
 # Include automatically generated dependency files
 -include $(wildcard *.d */*.d)
-- 
1.6.1.3


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
address@hidden                 http://www.aurel32.net