[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/24] meson: install $localstatedir/run for qga
From: |
Paolo Bonzini |
Subject: |
[PULL 08/24] meson: install $localstatedir/run for qga |
Date: |
Tue, 1 Sep 2020 05:11:16 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-6-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 10 +---------
qga/meson.build | 2 ++
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index dc3c20dd5e..9a9e7c0301 100644
--- a/Makefile
+++ b/Makefile
@@ -232,17 +232,9 @@ distclean: clean ninja-distclean
install-datadir:
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
-install-localstatedir:
-ifdef CONFIG_POSIX
-ifeq ($(CONFIG_GUEST_AGENT),y)
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_localstatedir)"/run
-endif
-endif
-
-
# Needed by "meson install"
export DESTDIR
-install: all install-datadir install-localstatedir
+install: all install-datadir
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
ifdef CONFIG_WIN32
diff --git a/qga/meson.build b/qga/meson.build
index 3f28f74b52..e5c5778a3e 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -82,6 +82,8 @@ if targetos == 'windows'
all_qga += [qga_msi]
alias_target('msi', qga_msi)
endif
+else
+ install_subdir('run', install_dir: get_option('localstatedir'))
endif
alias_target('qemu-ga', all_qga)
--
2.26.2
- [PULL 00/24] Meson changes for 2020-09-01, Paolo Bonzini, 2020/09/01
- [PULL 02/24] block: always link with zlib, Paolo Bonzini, 2020/09/01
- [PULL 01/24] meson: bump submodule to 0.55.1, Paolo Bonzini, 2020/09/01
- [PULL 03/24] meson: fix SDL2_image detection, Paolo Bonzini, 2020/09/01
- [PULL 05/24] meson: install scripts/qemu-trace-stap, Paolo Bonzini, 2020/09/01
- [PULL 04/24] meson: install pc-bios blobs, Paolo Bonzini, 2020/09/01
- [PULL 06/24] meson: install icons, Paolo Bonzini, 2020/09/01
- [PULL 09/24] build-sys: remove install target from Makefile, Paolo Bonzini, 2020/09/01
- [PULL 08/24] meson: install $localstatedir/run for qga,
Paolo Bonzini <=
- [PULL 11/24] configure: rename confsuffix option, Paolo Bonzini, 2020/09/01
- [PULL 07/24] meson: install desktop file, Paolo Bonzini, 2020/09/01
- [PULL 10/24] meson: move zlib detection to meson, Paolo Bonzini, 2020/09/01
- [PULL 12/24] configure: always /-seperate directory from qemu_suffix, Paolo Bonzini, 2020/09/01
- [PULL 14/24] meson: pass qemu_suffix option, Paolo Bonzini, 2020/09/01
- [PULL 13/24] configure: build docdir like other suffixed directories, Paolo Bonzini, 2020/09/01
- [PULL 17/24] meson: use meson mandir instead of qemu_mandir, Paolo Bonzini, 2020/09/01
- [PULL 16/24] meson: pass docdir option, Paolo Bonzini, 2020/09/01
- [PULL 19/24] meson: add pixman dependency to chardev/baum module, Paolo Bonzini, 2020/09/01
- [PULL 21/24] configure: do not include ${prefix} in firmwarepath, Paolo Bonzini, 2020/09/01