discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d2a7a1ece76a9aa8346648d99db2d693a676792d
commit d2a7a1ece76a9aa8346648d99db2d693a676792d Author: Mike Blumenkrantz <[email protected]> Date: Wed Sep 13 12:00:56 2017 -0400 install wayland session file fix T4885 --- configure.ac | 2 +- data/Makefile.mk | 2 +- data/session/Makefile.mk | 5 +++++ data/{xsession => session}/enlightenment.desktop.in | 2 ++ data/session/meson.build | 12 ++++++++++++ data/xsession/Makefile.mk | 3 --- data/xsession/meson.build | 8 -------- meson.build | 2 +- meson_dist.mk | 2 +- 9 files changed, 23 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index a0125c622..dcd39b4a3 100644 --- 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 diff --git a/data/Makefile.mk b/data/Makefile.mk index 783744b29..819398e8a 100644 --- 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 diff --git a/data/session/Makefile.mk b/data/session/Makefile.mk new file mode 100644 index 000000000..6cd7d06f3 --- /dev/null +++ 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 diff --git a/data/xsession/enlightenment.desktop.in b/data/session/enlightenment.desktop.in similarity index 97% rename from data/xsession/enlightenment.desktop.in rename to data/session/enlightenment.desktop.in index cf34d641c..ce233b3a2 100644 --- a/data/xsession/enlightenment.desktop.in +++ b/data/session/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 diff --git a/data/session/meson.build b/data/session/meson.build new file mode 100644 index 000000000..cf0af91b5 --- /dev/null +++ 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')) diff --git a/data/xsession/Makefile.mk b/data/xsession/Makefile.mk deleted file mode 100644 index c42858039..000000000 --- a/data/xsession/Makefile.mk +++ /dev/null @@ -1,3 +0,0 @@ -xsessionfilesdir = $(datadir)/xsessions -xsessionfiles_DATA = data/xsession/enlightenment.desktop -EXTRA_DIST += data/xsession/enlightenment.desktop.in diff --git a/data/xsession/meson.build b/data/xsession/meson.build deleted file mode 100644 index dbf3f22ff..000000000 --- a/data/xsession/meson.build +++ /dev/null @@ -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 - ) diff --git a/meson.build b/meson.build index 007204db2..42f36bd64 100644 --- 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') diff --git a/meson_dist.mk b/meson_dist.mk index a9c6dbd72..9498db52c 100644 --- 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 \ --
