diff options
-rw-r--r-- | Makefile | 10 | ||||
-rw-r--r-- | qga/meson.build | 2 |
2 files changed, 3 insertions, 9 deletions
@@ -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) |