diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-09-13 12:00:56 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-09-13 11:43:51 -0400 |
| commit | d2a7a1ece76a9aa8346648d99db2d693a676792d (patch) | |
| tree | 61e091df7bd964b92596f194643c4c847fbdcd3e /data | |
| parent | 2f9b8beedc32e2f66f0b420ebbbb0c270f1deae0 (diff) | |
| download | enlightenment-d2a7a1ece76a9aa8346648d99db2d693a676792d.tar.gz | |
install wayland session file
fix T4885
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.mk | 2 | ||||
| -rw-r--r-- | data/session/Makefile.mk | 5 | ||||
| -rw-r--r-- | data/session/enlightenment.desktop.in (renamed from data/xsession/enlightenment.desktop.in) | 2 | ||||
| -rw-r--r-- | data/session/meson.build | 12 | ||||
| -rw-r--r-- | data/xsession/Makefile.mk | 3 | ||||
| -rw-r--r-- | data/xsession/meson.build | 8 |
6 files changed, 20 insertions, 12 deletions
diff --git a/data/Makefile.mk b/data/Makefile.mk index 783744b298..819398e8a5 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 0000000000..6cd7d06f3c --- /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 index cf34d641cb..ce233b3a2e 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 0000000000..cf0af91b5d --- /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 c428580392..0000000000 --- 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 dbf3f22ffe..0000000000 --- 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 - ) |