discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0921b8859a1a0175f311250519351538930792df
commit 0921b8859a1a0175f311250519351538930792df Author: Mike Blumenkrantz <[email protected]> Date: Wed Sep 13 12:00:56 2017 -0400 install session files conditionally based on the available session types --- data/session/Makefile.mk | 6 ++++++ data/session/meson.build | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/data/session/Makefile.mk b/data/session/Makefile.mk index 6cd7d06f3..8e6b23b8d 100644 --- a/data/session/Makefile.mk +++ b/data/session/Makefile.mk @@ -1,5 +1,11 @@ +if ! HAVE_WAYLAND_ONLY xsessionfilesdir = $(datadir)/xsessions xsessionfiles_DATA = data/session/enlightenment.desktop +endif + +if HAVE_WAYLAND wlsessionfilesdir = $(datadir)/wayland-sessions wlsessionfiles_DATA = data/session/enlightenment.desktop +endif + EXTRA_DIST += data/session/enlightenment.desktop.in diff --git a/data/session/meson.build b/data/session/meson.build index cf0af91b5..fbe1849cf 100644 --- a/data/session/meson.build +++ b/data/session/meson.build @@ -5,8 +5,12 @@ e_desktop = configure_file(input : 'enlightenment.desktop.in', configuration: desktop_config ) -install_data(e_desktop, - install_dir : join_paths(dir_data, 'xsessions')) +if config_h.has('HAVE_WAYLAND_ONLY') == false + install_data(e_desktop, + install_dir : join_paths(dir_data, 'xsessions')) +endif -install_data(e_desktop, - install_dir : join_paths(dir_data, 'wayland-sessions')) +if config_h.has('HAVE_WAYLAND') == false + install_data(e_desktop, + install_dir : join_paths(dir_data, 'wayland-sessions')) +endif --
