diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-16 03:19:14 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-26 07:08:38 -0400 |
| commit | 16bf7a3326d8e8be42b3bf844a6c539d52a997b3 (patch) | |
| tree | e2e5d5904c3bd3a8481b3bd87a95bf66962802fd /pc-bios | |
| parent | fe0038bec26fdac2256db43894d55d1a6f798c0f (diff) | |
configure: move directory options from config-host.mak to meson
Since installation is not part of Makefiles anymore, Make need not
know the directories anymore. Meson already knows them through
built-in options, do everything using them instead of the config_host
dictionary.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/descriptors/meson.build | 2 | ||||
| -rw-r--r-- | pc-bios/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build index 3798d32372..a200e5ebc3 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -8,7 +8,7 @@ foreach f: [ ] configure_file(input: files(f), output: f, - configuration: {'DATADIR': config_host['qemu_datadir']}, + configuration: {'DATADIR': qemu_datadir}, install: install_blobs, install_dir: qemu_datadir / 'firmware') endforeach diff --git a/pc-bios/meson.build b/pc-bios/meson.build index a0d21be432..03df50c485 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -86,7 +86,7 @@ blobs = files( ) if install_blobs - install_data(blobs, install_dir: config_host['qemu_datadir']) + install_data(blobs, install_dir: qemu_datadir) endif subdir('descriptors') |