From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzqVx-00033F-L0 for qemu-devel@nongnu.org; Sat, 03 Sep 2011 09:44:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzqVw-0004b9-Oi for qemu-devel@nongnu.org; Sat, 03 Sep 2011 09:44:05 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:58643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzqVw-0004an-DK for qemu-devel@nongnu.org; Sat, 03 Sep 2011 09:44:04 -0400 Message-Id: <069ADDF5-0DF7-485C-9BF7-C7F697017070@web.de> From: =?ISO-8859-1?Q?Andreas_F=E4rber?= In-Reply-To: <4E60F8D8.2080605@us.ibm.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v936) Date: Sat, 3 Sep 2011 15:44:01 +0200 References: <1314629736-13023-1-git-send-email-aliguori@us.ibm.com> <4E60F8D8.2080605@us.ibm.com> Sender: andreas.faerber@web.de Subject: Re: [Qemu-devel] [PATCH] Rename qemu -> qemu-system-i386 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , qemu-devel@nongnu.org Am 02.09.2011 um 17:40 schrieb Anthony Liguori: > On 08/29/2011 09:55 AM, Anthony Liguori wrote: >> 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 > > Applied. > > Regards, > > Anthony Liguori > >> --- >> Makefile | 5 ++--- >> Makefile.target | 4 ---- >> 2 files changed, 2 insertions(+), 7 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 8606849..51ecdb5 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -365,9 +365,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 07af4d4..29287ed 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= This will leave an old qemu executable from a previous `make install` behind. We should check for it and, unless it's a symlink to qemu-system-i386, remove it in the install target. Andreas