diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-08-26 15:04:16 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-01 08:51:33 -0400 |
| commit | ab4c0996f80d43d1fc28c6e76f4ecb27423a7e29 (patch) | |
| tree | 62cbaf2a60cc5c3c47202dc62c112fe51e1e6a76 /pc-bios/keymaps | |
| parent | 73f3aa3766e64492559e3ec05b5cc2cfde0d2c9e (diff) | |
| download | qemu-ab4c0996f80d43d1fc28c6e76f4ecb27423a7e29.zip qemu-ab4c0996f80d43d1fc28c6e76f4ecb27423a7e29.tar.gz qemu-ab4c0996f80d43d1fc28c6e76f4ecb27423a7e29.tar.bz2 | |
meson: use meson datadir instead of qemu_datadir
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>
Diffstat (limited to 'pc-bios/keymaps')
| -rw-r--r-- | pc-bios/keymaps/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c82..bbac83e 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -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') |