motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: use meson datadir instead of qemu_datadir

Browse source 
When cross-compiling, by default qemu_datadir is 'c:\Program
Files\QEMU', which is not recognized as being an absolute path, and
meson will end up adding the prefix again.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-6-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:16 +04:00 • committed by Paolo Bonzini
parent 73f3aa3766
commit ab4c0996f8
8 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pc-bios/descriptors/meson.build
View file

@ -10,5 +10,5 @@ foreach f: [
output: f,
configuration: {'DATADIR': config_host['qemu_datadir']},
install: install_blobs,
install_dir: config_host['qemu_datadir'] / 'firmware')
install_dir: qemu_datadir / 'firmware')
endforeach

6
pc-bios/keymaps/meson.build
View file

@ -44,13 +44,13 @@ foreach km, args: keymaps
build_by_default: true,
output: km,
command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
install_dir: config_host['qemu_datadir'] / 'keymaps')
install_dir: qemu_datadir / 'keymaps')
endforeach
if t.length() > 0
alias_target('update-keymaps', t)
else
# install from the source tree
install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / 'keymaps')
install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
endif
install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'keymaps')
install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')

2
pc-bios/meson.build
View file

@ -19,7 +19,7 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
input: '@0@.bz2'.format(f),
capture: true,
install: install_blobs,
install_dir: config_host['qemu_datadir'],
install_dir: qemu_datadir,
command: [ bzip2, '-dc', '@INPUT0@' ])
endforeach
endif