diff --git a/data/meson.build b/data/meson.build index 80060c59..35f00e72 100644 --- a/data/meson.build +++ b/data/meson.build @@ -10,33 +10,33 @@ session_desktops = [ session_desktop_base + '-wayland', ] -foreach name: session_desktops - session_desktop = name + '.desktop' - if name.endswith('-xorg') - session_instdir = xsessiondir - elif name.endswith('-wayland') - session_instdir = wlsessiondir - else - # FIXME: The same target can not be copied into two directories. - # There is a workaround in meson/session-post-install.py until proper - # solution arises: - # https://github.com/mesonbuild/meson/issues/2416 - session_instdir = xsessiondir - #session_instdir = [ xesssiondir, wlsessiondir ] - endif - i18n.merge_file( - input: session_desktop + '.in', - output: session_desktop, - po_dir: '../po', - install: true, - install_dir: session_instdir, - type: 'desktop', - ) +foreach name : session_desktops + session_desktop = name + '.desktop' + if name.endswith('-xorg') + session_instdir = xsessiondir + elif name.endswith('-wayland') + session_instdir = wlsessiondir + else +# FIXME: The same target can not be copied into two directories. + # There is a workaround in meson/session-post-install.py until proper + # solution arises: + # https://github.com/mesonbuild/meson/issues/2416 + session_instdir = xsessiondir + #session_instdir = [ xesssiondir, wlsessiondir ] + endif + i18n.merge_file( + input: session_desktop + '.in', + output: session_desktop, + po_dir: '../po', + install: true, + install_dir: session_instdir, + type: 'desktop', + ) endforeach classic_uuids = [] foreach e : classic_extensions - classic_uuids += e + uuid_suffix + classic_uuids += e + uuid_suffix endforeach mode_conf = configuration_data() diff --git a/meson.build b/meson.build index 31e683e6..c6c212c8 100644 --- a/meson.build +++ b/meson.build @@ -72,7 +72,7 @@ endif classic_mode_enabled = get_option('classic_mode') if classic_mode_enabled - # Sanity check: Make sure all classic extensions are enabled +# Sanity check: Make sure all classic extensions are enabled foreach e : classic_extensions if not enabled_extensions.contains(e) error(f'Classic mode is enabled, but the required extension @e@ is not') @@ -98,17 +98,13 @@ endif subdir('extensions') subdir('po') -gnome.post_install( - glib_compile_schemas: true, -) +gnome.post_install(glib_compile_schemas: true) -meson.add_dist_script('meson/check-version.py', - meson.project_version(), - 'NEWS') +meson.add_dist_script('meson/check-version.py', meson.project_version(), 'NEWS') summary_options = { - 'extensions': enabled_extensions, - 'classic_mode': get_option('classic_mode'), + 'extensions': enabled_extensions, + 'classic_mode': get_option('classic_mode'), } summary_dirs = {