diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-18 12:22:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-08-21 16:29:56 +0200 |
| commit | 0814465ab8a1440a6587fd9b489d13ed63595166 (patch) | |
| tree | 23c5cc3db7c206e8728ade8c4e8830edb50f154b | |
| parent | e65472c7bc413d79faa61eb1d05c540b03945894 (diff) | |
| download | focaccia-qemu-0814465ab8a1440a6587fd9b489d13ed63595166.tar.gz focaccia-qemu-0814465ab8a1440a6587fd9b489d13ed63595166.zip | |
qemu-ga: clean up TOOLS variable
qemu-ga is included in the TOOLS variable without the .exe suffix, and this is then worked around twice in the Makefile. Do the right thing in configure instead. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 85862fb81a..00825cd270 100644 --- a/Makefile +++ b/Makefile @@ -681,7 +681,7 @@ clean: recurse-clean ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ -exec rm {} + rm -f $(edk2-decompressed) - rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga$(EXESUF) TAGS cscope.* *.pod *~ */*~ + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~ rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h @@ -845,7 +845,7 @@ install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstated $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif ifneq ($(CONFIG_MODULES),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" diff --git a/configure b/configure index 942a73b795..e96981bbf8 100755 --- a/configure +++ b/configure @@ -6129,7 +6129,7 @@ if [ "$guest_agent" != "no" ]; then if [ "$softmmu" = no -a "$want_tools" = no ] ; then guest_agent=no elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then - tools="qemu-ga $tools" + tools="qemu-ga\$(EXESUF) $tools" guest_agent=yes elif [ "$guest_agent" != yes ]; then guest_agent=no |