aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-09-13 16:00:56 (GMT)
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-09-13 15:52:41 (GMT)
commit0921b8859a1a0175f311250519351538930792df (patch)
treeabcd5e05f3dc881f17a8fa118ac9d9dfbab12420
parentinstall wayland session file (diff)
downloadenlightenment-0921b8859a1a0175f311250519351538930792df.tar.gz
install session files conditionally based on the available session types
-rw-r--r--data/session/Makefile.mk6
-rw-r--r--data/session/meson.build12
2 files changed, 14 insertions, 4 deletions
diff --git a/data/session/Makefile.mk b/data/session/Makefile.mk
index 6cd7d06..8e6b23b 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 cf0af91..fbe1849 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