From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1k0R-0004dv-LF for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:01:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1k0P-0000lN-Po for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:01:47 -0500 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]:36653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1k0P-0000lG-LO for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:01:45 -0500 Received: by obdgf3 with SMTP id gf3so51675221obd.3 for ; Wed, 25 Nov 2015 16:01:45 -0800 (PST) Sender: fluxion From: Michael Roth Date: Wed, 25 Nov 2015 18:01:20 -0600 Message-Id: <1448496085-17746-2-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1448496085-17746-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1448496085-17746-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PULL v2 for-2.5 1/6] makefile: fix qemu-ga make install for --disable-tools List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Michael Roth , Stefan Weil ab59e3e introduced a fix for `make install` on w32 that involved filtering out qemu-ga from $TOOLS install recipe so that we could append $(EXESUF) to it before attempting to install the binary via install-prog function. install-prog takes a list of binaries to install to a particular directory. If the list is empty it breaks. We guard against this by ensuring $TOOLS is not empty prior to calling. However, ab59e3e introduces extra filtering after this check which can still result on us attempting to call install-prog with an empty list of binaries. In particular, this occurs if we build with the --disable-tools configure option, which results in qemu-ga being the only member of $TOOLS. Fix this by doing a simple s/qemu-ga/qemu-ga$(EXESUF)/ pass through $TOOLS instead of filtering out qemu-ga to handle it seperately. Reported-by: Steve Ellcey Cc: Stefan Weil Signed-off-by: Michael Roth --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7fa427..930ac27 100644 --- a/Makefile +++ b/Makefile @@ -440,10 +440,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) \ install-datadir install-localstatedir ifneq ($(TOOLS),) - $(call install-prog,$(filter-out qemu-ga,$(TOOLS)),$(DESTDIR)$(bindir)) -ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(call install-prog,qemu-ga$(EXESUF),$(DESTDIR)$(bindir)) -endif + $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) endif ifneq ($(CONFIG_MODULES),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" -- 1.9.1