[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] meson: use meson mandir instead of qemu_mandir
From: |
marcandre . lureau |
Subject: |
[PATCH 4/5] meson: use meson mandir instead of qemu_mandir |
Date: |
Tue, 25 Aug 2020 19:04:08 +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.
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 33281cecc3..0720a7d684 100644
--- a/meson.build
+++ b/meson.build
@@ -1210,7 +1210,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 0/5] meson: mingw installation fixes & nsis conversion, marcandre . lureau, 2020/08/25
- [PATCH 1/5] meson: pass confsuffix option, marcandre . lureau, 2020/08/25
- [PATCH 2/5] meson: use meson datadir instead of qemu_datadir, marcandre . lureau, 2020/08/25
- [PATCH 3/5] meson: add docdir option and pass pre-prefix qemu_docdir, marcandre . lureau, 2020/08/25
- [PATCH 4/5] meson: use meson mandir instead of qemu_mandir,
marcandre . lureau <=
- [PATCH 5/5] meson: add NSIS building, marcandre . lureau, 2020/08/25
- Re: [PATCH 5/5] meson: add NSIS building, Peter Maydell, 2020/08/25
- Re: [PATCH 0/5] meson: mingw installation fixes & nsis conversion, Paolo Bonzini, 2020/08/25