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

configure: move directory options from config-host.mak to meson

Browse source 
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>
This commit is contained in:
Paolo Bonzini 2020-10-16 03:19:14 -04:00
parent fe0038bec2
commit 16bf7a3326
11 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ui/icons/meson.build
View file

@ -2,12 +2,12 @@ foreach s: [16, 24, 32, 48, 64, 128, 256, 512]
s = '@0@x@0@'.format(s.to_string())
install_data('qemu_@0@.png'.format(s),
rename: 'qemu.png',
install_dir: config_host['qemu_icondir'] / 'hicolor' / s / 'apps')
install_dir: qemu_icondir / 'hicolor' / s / 'apps')
endforeach
install_data('qemu_32x32.bmp',
rename: 'qemu.bmp',
install_dir: config_host['qemu_icondir'] / 'hicolor' / '32x32' / 'apps')
install_dir: qemu_icondir / 'hicolor' / '32x32' / 'apps')
install_data('qemu.svg',
install_dir: config_host['qemu_icondir'] / 'hicolor' / 'scalable' / 'apps')
install_dir: qemu_icondir / 'hicolor' / 'scalable' / 'apps')

2
ui/meson.build
View file

@ -139,7 +139,7 @@ subdir('shader')
if have_system
subdir('icons')
install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
install_data('qemu.desktop', install_dir: qemu_desktopdir)
endif
modules += {'ui': ui_modules}