From ee8773c41af6ff71625ecc44c2077d23c3efddab Mon Sep 17 00:00:00 2001 From: Riccardo Calixte Date: Wed, 11 Sep 2019 08:30:57 -0400 Subject: [PATCH] Updating Meson build Wayland conditional to match Makefile Summary: The conditional logic is flawed. If `HAVE_WAYLAND` is true, only then should the path be updated to include wayland-sessions. Test Plan: Verified desired output in build/meson-info/intro-installed.json after testing a clean build Reviewers: devilhorns Subscribers: cedric, zmike Tags: #enlightenment-git Differential Revision: https://phab.enlightenment.org/D9868 --- data/session/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/session/meson.build b/data/session/meson.build index b0cfda0ac..8285b5bbd 100644 --- a/data/session/meson.build +++ b/data/session/meson.build @@ -6,12 +6,12 @@ e_desktop = configure_file(input : 'enlightenment.desktop.in', configuration: desktop_config ) +if config_h.has('HAVE_WAYLAND') == true + install_data(e_desktop, + install_dir : join_paths(dir_data, 'wayland-sessions')) +endif + if config_h.has('HAVE_WAYLAND_ONLY') == false install_data(e_desktop, install_dir : join_paths(dir_data, 'xsessions')) endif - -if config_h.has('HAVE_WAYLAND') == false - install_data(e_desktop, - install_dir : join_paths(dir_data, 'wayland-sessions')) -endif