install wayland session file

fix T4885
6 years ago · d2a7a1ece7
parent 2f9b8beedc
commit d2a7a1ece7
9 changed files with 23 additions and 15 deletions
--- a/configure.ac
+++ b/configure.ac
@ -1059,7 +1059,7 @@ Makefile
 enlightenment.pc
 src/bin/e_fm_shared_types.h
 src/modules/everything/everything.pc
-data/xsession/enlightenment.desktop
+data/session/enlightenment.desktop
 data/etc/sysactions.conf
 data/units/enlightenment.service
 doc/Doxyfile
--- a/data/Makefile.mk
+++ b/data/Makefile.mk
@ -1,6 +1,6 @@
 include data/images/Makefile.mk
 include data/tools/Makefile.mk
-include data/xsession/Makefile.mk
+include data/session/Makefile.mk
 include data/input_methods/Makefile.mk
 include data/etc/Makefile.mk
 include data/icons/Makefile.mk
--- a/data/session/Makefile.mk
+++ b/data/session/Makefile.mk
@ -0,0 +1,5 @@
+xsessionfilesdir = $(datadir)/xsessions
+xsessionfiles_DATA = data/session/enlightenment.desktop
+wlsessionfilesdir = $(datadir)/wayland-sessions
+wlsessionfiles_DATA = data/session/enlightenment.desktop
+EXTRA_DIST += data/session/enlightenment.desktop.in
--- a/data/xsession/enlightenment.desktop.in
+++ b/data/xsession/enlightenment.desktop.in
@ -35,3 +35,5 @@ Comment[tr]=Enlightenment kullanarak giriş yaın (Version @VERSION@)
 Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
 TryExec=@prefix@/bin/enlightenment_start
 Exec=@prefix@/bin/enlightenment_start
+Type=Application
+DesktopNames=Enlightenment
--- a/data/session/meson.build
+++ b/data/session/meson.build
@ -0,0 +1,12 @@
+desktop_config = configuration_data()
+desktop_config.set('prefix', dir_prefix)
+e_desktop = configure_file(input        : 'enlightenment.desktop.in',
+               output       : 'enlightenment.desktop',
+               configuration: desktop_config
+              )
+
+install_data(e_desktop,
+	install_dir  : join_paths(dir_data, 'xsessions'))
+
+install_data(e_desktop,
+	install_dir  : join_paths(dir_data, 'wayland-sessions'))
--- a/data/xsession/Makefile.mk
+++ b/data/xsession/Makefile.mk
@ -1,3 +0,0 @@
-xsessionfilesdir = $(datadir)/xsessions
-xsessionfiles_DATA = data/xsession/enlightenment.desktop
-EXTRA_DIST += data/xsession/enlightenment.desktop.in
--- a/data/xsession/meson.build
+++ b/data/xsession/meson.build
@ -1,8 +0,0 @@
-desktop_config = configuration_data()
-desktop_config.set('prefix', dir_prefix)
-configure_file(input        : 'enlightenment.desktop.in',
-               output       : 'enlightenment.desktop',
-               install      : true,
-               install_dir  : join_paths(dir_data, 'xsessions'),
-               configuration: desktop_config
-              )
--- a/meson.build
+++ b/meson.build
@ -350,7 +350,7 @@ subdir('data/images')
 subdir('data/input_methods')
 subdir('data/tools')
 subdir('data/units')
-subdir('data/xsession')
+subdir('data/session')

 subdir('doc')

--- a/meson_dist.mk
+++ b/meson_dist.mk
@ -14,7 +14,7 @@ data/images/meson.build \
 data/input_methods/meson.build \
 data/tools/meson.build \
 data/units/meson.build \
-data/xsession/meson.build \
+data/session/meson.build \
 doc/meson.build \
 meson.build \
 meson-chmod.sh \