From 8ab1aabc5d33a09ceee1adc1148f62cbb16cb43d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 26 Aug 2020 17:06:21 +0400 Subject: [PATCH] meson: install $localstatedir/run for qga MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau Message-Id: <20200826130622.553318-6-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- 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.11.4.GIT