diff options
| author | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-11-23 15:48:58 -0600 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-11-25 10:21:54 -0600 |
| commit | 68aa262ad09c81b8b1284340cc0d26b65c605df5 (patch) | |
| tree | ea49b05b590d4f37d908a1ee110ade63ed003baa | |
| parent | 1a4dab849d5d06191ab5e5850f6b8bfcad8ceb47 (diff) | |
| download | qemu-68aa262ad09c81b8b1284340cc0d26b65c605df5.zip qemu-68aa262ad09c81b8b1284340cc0d26b65c605df5.tar.gz qemu-68aa262ad09c81b8b1284340cc0d26b65c605df5.tar.bz2 | |
makefile: fix qemu-ga make install for --disable-tools
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 <sellcey@imgtec.com>
Cc: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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)" |