From abdc9f3019b881b32508d0420ad1a36252846340 Mon Sep 17 00:00:00 2001 From: Ryan Lucia <ryan@luciaonline.net> Date: Sun, 6 Oct 2019 15:59:40 -0400 Subject: [PATCH] meson: move all .desktop file work into linux conditional --- packages/meson.build | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/meson.build b/packages/meson.build index b4db1e0e0..f2a02902c 100644 --- a/packages/meson.build +++ b/packages/meson.build @@ -1,12 +1,13 @@ -c_pkg = configuration_data() -c_pkg.set('AEGISUB_COMMAND', 'aegisub') +conf_pkg = configuration_data() if host_machine.system() == 'windows' elif host_machine.system() == 'darwin' else + conf_pkg.set('AEGISUB_COMMAND', 'aegisub') + desktop_template = configure_file(input: 'desktop/aegisub.desktop.template.in', output: 'aegisub.desktop.template', - configuration: c_pkg) + configuration: conf_pkg) i18n = import('i18n') i18n.merge_file(input: desktop_template, @@ -15,13 +16,13 @@ else po_dir: '../po', install: true, install_dir: join_paths(get_option('datadir'), 'applications')) -endif -aegisub_logos = ['16x16.png', '22x22.png', '24x24.png', '32x32.png', '48x48.png', '64x64.png', 'scalable.svg'] + aegisub_logos = ['16x16.png', '22x22.png', '24x24.png', '32x32.png', '48x48.png', '64x64.png', 'scalable.svg'] -foreach s: aegisub_logos - dir = s.split('.')[0] - ext = s.split('.')[1] - install_data('desktop' / dir / 'aegisub.' + ext, - install_dir: get_option('datadir') / 'icons' / 'hicolor' / dir / 'apps') -endforeach + foreach s: aegisub_logos + dir = s.split('.')[0] + ext = s.split('.')[1] + install_data('desktop' / dir / 'aegisub.' + ext, + install_dir: get_option('datadir') / 'icons' / 'hicolor' / dir / 'apps') + endforeach +endif -- GitLab