summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-09-13 12:00:56 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-09-13 11:43:51 -0400
commitd2a7a1ece76a9aa8346648d99db2d693a676792d (patch)
tree61e091df7bd964b92596f194643c4c847fbdcd3e /data
parent2f9b8beedc32e2f66f0b420ebbbb0c270f1deae0 (diff)
install wayland session file
fix T4885
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.mk2
-rw-r--r--data/session/Makefile.mk5
-rw-r--r--data/session/enlightenment.desktop.in (renamed from data/xsession/enlightenment.desktop.in)2
-rw-r--r--data/session/meson.build12
-rw-r--r--data/xsession/Makefile.mk3
-rw-r--r--data/xsession/meson.build8
6 files changed, 20 insertions, 12 deletions
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 @@
1include data/images/Makefile.mk 1include data/images/Makefile.mk
2include data/tools/Makefile.mk 2include data/tools/Makefile.mk
3include data/xsession/Makefile.mk 3include data/session/Makefile.mk
4include data/input_methods/Makefile.mk 4include data/input_methods/Makefile.mk
5include data/etc/Makefile.mk 5include data/etc/Makefile.mk
6include data/icons/Makefile.mk 6include 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 @@
1xsessionfilesdir = $(datadir)/xsessions
2xsessionfiles_DATA = data/session/enlightenment.desktop
3wlsessionfilesdir = $(datadir)/wayland-sessions
4wlsessionfiles_DATA = data/session/enlightenment.desktop
5EXTRA_DIST += data/session/enlightenment.desktop.in
diff --git a/data/xsession/enlightenment.desktop.in b/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@)
35Icon=@prefix@/share/enlightenment/data/images/enlightenment.png 35Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
36TryExec=@prefix@/bin/enlightenment_start 36TryExec=@prefix@/bin/enlightenment_start
37Exec=@prefix@/bin/enlightenment_start 37Exec=@prefix@/bin/enlightenment_start
38Type=Application
39DesktopNames=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 @@
1desktop_config = configuration_data()
2desktop_config.set('prefix', dir_prefix)
3e_desktop = configure_file(input : 'enlightenment.desktop.in',
4 output : 'enlightenment.desktop',
5 configuration: desktop_config
6 )
7
8install_data(e_desktop,
9 install_dir : join_paths(dir_data, 'xsessions'))
10
11install_data(e_desktop,
12 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 @@
1xsessionfilesdir = $(datadir)/xsessions
2xsessionfiles_DATA = data/xsession/enlightenment.desktop
3EXTRA_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 @@
1desktop_config = configuration_data()
2desktop_config.set('prefix', dir_prefix)
3configure_file(input : 'enlightenment.desktop.in',
4 output : 'enlightenment.desktop',
5 install : true,
6 install_dir : join_paths(dir_data, 'xsessions'),
7 configuration: desktop_config
8 )