[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 23/34] meson: always combine directories with prefix
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 23/34] meson: always combine directories with prefix |
Date: |
Sat, 23 Apr 2022 14:51:40 +0200 |
Meson allows directories such as "bindir" to be relative to the prefix. Right
now configure is forcing an absolute path, but that is not really necessary:
just make sure all uses of the directory variables are prefixed appropriately.
Do the same also for the options that are custom for QEMU, i.e. docdir and
qemu_firmwarepath.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index 1fdc74c86a..cdbdb1ef8b 100644
--- a/meson.build
+++ b/meson.build
@@ -1618,7 +1618,7 @@ config_host_data.set_quoted('CONFIG_PREFIX',
get_option('prefix'))
config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') /
qemu_confdir)
config_host_data.set_quoted('CONFIG_QEMU_DATADIR', get_option('prefix') /
qemu_datadir)
config_host_data.set_quoted('CONFIG_QEMU_DESKTOPDIR', get_option('prefix') /
qemu_desktopdir)
-config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH',
get_option('qemu_firmwarepath'))
+config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH', get_option('prefix') /
get_option('qemu_firmwarepath'))
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') /
get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') /
qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') /
get_option('localedir'))
@@ -3626,20 +3626,20 @@ endif
summary_info = {}
summary_info += {'Install prefix': get_option('prefix')}
summary_info += {'BIOS directory': qemu_datadir}
-summary_info += {'firmware path': get_option('qemu_firmwarepath')}
-summary_info += {'binary directory': get_option('bindir')}
-summary_info += {'library directory': get_option('libdir')}
+summary_info += {'firmware path': get_option('prefix') /
get_option('qemu_firmwarepath')}
+summary_info += {'binary directory': get_option('prefix') /
get_option('bindir')}
+summary_info += {'library directory': get_option('prefix') /
get_option('libdir')}
summary_info += {'module directory': qemu_moddir}
-summary_info += {'libexec directory': get_option('libexecdir')}
-summary_info += {'include directory': get_option('includedir')}
-summary_info += {'config directory': get_option('sysconfdir')}
+summary_info += {'libexec directory': get_option('prefix') /
get_option('libexecdir')}
+summary_info += {'include directory': get_option('prefix') /
get_option('includedir')}
+summary_info += {'config directory': get_option('prefix') /
get_option('sysconfdir')}
if targetos != 'windows'
- summary_info += {'local state directory': get_option('localstatedir')}
- summary_info += {'Manual directory': get_option('mandir')}
+ summary_info += {'local state directory': get_option('prefix') /
get_option('localstatedir')}
+ summary_info += {'Manual directory': get_option('prefix') /
get_option('mandir')}
else
summary_info += {'local state directory': 'queried at runtime'}
endif
-summary_info += {'Doc directory': get_option('docdir')}
+summary_info += {'Doc directory': get_option('prefix') /
get_option('docdir')}
summary_info += {'Build directory': meson.current_build_dir()}
summary_info += {'Source path': meson.current_source_dir()}
summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']}
--
2.35.1
- [PATCH v2 06/34] configure: move --enable/--disable-debug-info to second option parsing pass, (continued)
- [PATCH v2 06/34] configure: move --enable/--disable-debug-info to second option parsing pass, Paolo Bonzini, 2022/04/23
- [PATCH v2 07/34] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 08/34] meson, configure: move RDMA options to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 09/34] meson, configure: move keyctl test to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 10/34] meson, configure: move usbfs test to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 11/34] meson, configure: move libgio test to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 13/34] meson, configure: move --enable-module-upgrades to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 12/34] meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target.h, Paolo Bonzini, 2022/04/23
- [PATCH v2 15/34] meson-buildoptions: add support for string options, Paolo Bonzini, 2022/04/23
- [PATCH v2 16/34] configure, meson: move iasl detection to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 23/34] meson: always combine directories with prefix,
Paolo Bonzini <=
- [PATCH v2 24/34] configure: switch directory options to automatic parsing, Paolo Bonzini, 2022/04/23
- [PATCH v2 14/34] meson, configure: move Xen detection to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 18/34] configure: switch string options to automatic parsing, Paolo Bonzini, 2022/04/23
- [PATCH v2 29/34] build: move vhost-vsock configuration to Kconfig, Paolo Bonzini, 2022/04/23
- [PATCH v2 27/34] meson, virtio: place all virtio-pci devices under virtio_pci_ss, Paolo Bonzini, 2022/04/23
- [PATCH v2 21/34] meson, configure: move --with-pkgversion, CONFIG_STAMP to meson, Paolo Bonzini, 2022/04/23
- [PATCH v2 28/34] configure: simplify vhost-net-{user, vdpa} configuration, Paolo Bonzini, 2022/04/23
- [PATCH v2 30/34] build: move vhost-scsi configuration to Kconfig, Paolo Bonzini, 2022/04/23
- [PATCH v2 31/34] build: move vhost-user-fs configuration to Kconfig, Paolo Bonzini, 2022/04/23
- [PATCH v2 32/34] meson: create have_vhost_* variables, Paolo Bonzini, 2022/04/23