ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: use meson mandir instead of qemu_mandir 

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>
Message-Id: <20200826110419.528931-8-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-08-26 15:04:18 +04:00 committed by Paolo Bonzini
parent 491e74c158
commit b81efab7c7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -6648,7 +6648,6 @@ echo "bindir=$bindir" >> $config_host_mak
echo "libdir=$libdir" >> $config_host_mak echo "libdir=$libdir" >> $config_host_mak
echo "libexecdir=$libexecdir" >> $config_host_mak echo "libexecdir=$libexecdir" >> $config_host_mak
echo "includedir=$includedir" >> $config_host_mak echo "includedir=$includedir" >> $config_host_mak
echo "mandir=$mandir" >> $config_host_mak
echo "sysconfdir=$sysconfdir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak
echo "qemu_confdir=$qemu_confdir" >> $config_host_mak echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "qemu_datadir=$qemu_datadir" >> $config_host_mak

4
meson.build
View File

@ -1223,7 +1223,7 @@ if build_docs
output: man, output: man,
capture: true, capture: true,
install: true, install: true,
install_dir: config_host['mandir'] / 'man7', install_dir: get_option('mandir') / 'man7',
command: [pod2man, '--utf8', '--section=7', '--center=" "', command: [pod2man, '--utf8', '--section=7', '--center=" "',
'--release=" "', '@INPUT@']) '--release=" "', '@INPUT@'])
endforeach endforeach
@ -1242,7 +1242,7 @@ summary_info += {'include directory': config_host['includedir']}
summary_info += {'config directory': config_host['sysconfdir']} summary_info += {'config directory': config_host['sysconfdir']}
if targetos != 'windows' if targetos != 'windows'
summary_info += {'local state directory': config_host['qemu_localstatedir']} summary_info += {'local state directory': config_host['qemu_localstatedir']}
summary_info += {'Manual directory': config_host['mandir']} summary_info += {'Manual directory': get_option('mandir')}
else else
summary_info += {'local state directory': 'queried at runtime'} summary_info += {'local state directory': 'queried at runtime'}
endif endif