Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LvSuM-0008Fm-9y for qemu-devel@nongnu.org; Sun, 19 Apr 2009 05:01:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LvSuK-0008Ez-De for qemu-devel@nongnu.org; Sun, 19 Apr 2009 05:01:48 -0400 Received: from [199.232.76.173] (port=59586 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LvSuK-0008Ev-9f for qemu-devel@nongnu.org; Sun, 19 Apr 2009 05:01:48 -0400 Received: from hall.aurel32.net ([88.191.82.174]:38627) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LvSuJ-0005XX-It for qemu-devel@nongnu.org; Sun, 19 Apr 2009 05:01:47 -0400 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1LvSuI-0003yw-Dv for qemu-devel@nongnu.org; Sun, 19 Apr 2009 11:01:46 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1LvSuH-0002ot-LU for qemu-devel@nongnu.org; Sun, 19 Apr 2009 11:01:45 +0200 Date: Sun, 19 Apr 2009 11:01:45 +0200 From: Aurelien Jarno Message-ID: <20090419090145.GB5483@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Subject: [Qemu-devel] [PATCH v2] Rename qemu into qemu-system-i386 and install a compat symlink Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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 aurelien@aurel32.net http://www.aurel32.net