raster pushed a commit to branch enlightenment-0.23.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=25ec83f91a400a0780ba9aa649ac4cdbfc0d8d75
commit 25ec83f91a400a0780ba9aa649ac4cdbfc0d8d75
Author: Riccardo Calixte <riccardocali...@gmail.com>
Date: Wed Sep 11 08:30:57 2019 -0400
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 | 8 ++++----
1 file changed, 4 insertions(+), 4 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_ONLY') == false
+if config_h.has('HAVE_WAYLAND') == true
install_data(e_desktop,
- install_dir : join_paths(dir_data, 'xsessions'))
+ install_dir : join_paths(dir_data, 'wayland-sessions'))
endif
-if config_h.has('HAVE_WAYLAND') == false
+if config_h.has('HAVE_WAYLAND_ONLY') == false
install_data(e_desktop,
- install_dir : join_paths(dir_data, 'wayland-sessions'))
+ install_dir : join_paths(dir_data, 'xsessions'))
endif
--
