[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 7/8] meson: use meson mandir instead of qemu_mandir
From: |
marcandre . lureau |
Subject: |
[PATCH v3 7/8] meson: use meson mandir instead of qemu_mandir |
Date: |
Wed, 26 Aug 2020 15:04:18 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
When cross-compiling, by default qemu_mandir is 'c:\Program
Files\QEMU', which is not recognized as being an absolute path, and
meson will end up adding the prefix again.
Use the pre-prefixed meson mandir option instead.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 7570aab830..d3196ea2d2 100644
--- a/meson.build
+++ b/meson.build
@@ -1211,7 +1211,7 @@ if build_docs
output: man,
capture: true,
install: true,
- install_dir: config_host['mandir'] / 'man7',
+ install_dir: get_option('mandir') / 'man7',
command: [pod2man, '--utf8', '--section=7',
'--center=" "',
'--release=" "', '@INPUT@'])
endforeach
--
2.26.2
- [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion, marcandre . lureau, 2020/08/26
- [PATCH v3 1/8] configure: rename confsuffix option, marcandre . lureau, 2020/08/26
- [PATCH v3 2/8] configure: always /-seperate directory from qemu_suffix, marcandre . lureau, 2020/08/26
- [PATCH v3 3/8] configure: build docdir like other suffixed directories, marcandre . lureau, 2020/08/26
- [PATCH v3 4/8] meson: pass qemu_suffix option, marcandre . lureau, 2020/08/26
- [PATCH v3 5/8] meson: use meson datadir instead of qemu_datadir, marcandre . lureau, 2020/08/26
- [PATCH v3 6/8] meson: pass docdir option, marcandre . lureau, 2020/08/26
- [PATCH v3 7/8] meson: use meson mandir instead of qemu_mandir,
marcandre . lureau <=
- [PATCH v3 8/8] meson: add NSIS building, marcandre . lureau, 2020/08/26
- Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion, Paolo Bonzini, 2020/08/26