[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/25] meson: always combine directories with prefix
From: |
Paolo Bonzini |
Subject: |
[PULL 13/25] meson: always combine directories with prefix |
Date: |
Fri, 29 Apr 2022 17:23:00 +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 83b06ca611..21135fbc52 100644
--- a/meson.build
+++ b/meson.build
@@ -1620,7 +1620,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'))
@@ -3628,20 +3628,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
- [PULL 01/25] WHPX: support for xcr0, (continued)
- [PULL 01/25] WHPX: support for xcr0, Paolo Bonzini, 2022/04/29
- [PULL 03/25] qga-vss: always build qga-vss.tlb when qga-vss.dll is built, Paolo Bonzini, 2022/04/29
- [PULL 06/25] configure, meson: move iasl detection to meson, Paolo Bonzini, 2022/04/29
- [PULL 08/25] configure: switch string options to automatic parsing, Paolo Bonzini, 2022/04/29
- [PULL 05/25] meson, configure: move Xen detection to meson, Paolo Bonzini, 2022/04/29
- [PULL 09/25] meson, configure: move --tls-priority to meson, Paolo Bonzini, 2022/04/29
- [PULL 10/25] meson, configure: move bdrv whitelists to meson, Paolo Bonzini, 2022/04/29
- [PULL 11/25] meson, configure: move --with-pkgversion, CONFIG_STAMP to meson, Paolo Bonzini, 2022/04/29
- [PULL 07/25] configure: move Windows flags detection to meson, Paolo Bonzini, 2022/04/29
- [PULL 12/25] meson, configure: move --interp-prefix to meson, Paolo Bonzini, 2022/04/29
- [PULL 13/25] meson: always combine directories with prefix,
Paolo Bonzini <=
- [PULL 17/25] meson, virtio: place all virtio-pci devices under virtio_pci_ss, Paolo Bonzini, 2022/04/29
- [PULL 16/25] configure: omit options with default values from meson command line, Paolo Bonzini, 2022/04/29
- [PULL 15/25] meson: pass more options directly as -D, Paolo Bonzini, 2022/04/29
- [PULL 21/25] build: move vhost-user-fs configuration to Kconfig, Paolo Bonzini, 2022/04/29
- [PULL 24/25] configure, meson: move vhost options to Meson, Paolo Bonzini, 2022/04/29
- [PULL 19/25] build: move vhost-vsock configuration to Kconfig, Paolo Bonzini, 2022/04/29
- [PULL 14/25] configure: switch directory options to automatic parsing, Paolo Bonzini, 2022/04/29
- [PULL 18/25] configure: simplify vhost-net-{user, vdpa} configuration, Paolo Bonzini, 2022/04/29
- [PULL 20/25] build: move vhost-scsi configuration to Kconfig, Paolo Bonzini, 2022/04/29
- [PULL 22/25] meson: create have_vhost_* variables, Paolo Bonzini, 2022/04/29