From 3e0d8bd56f8dde70598d39a60007f4e376c4ec35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 22 Feb 2018 14:37:52 +0100 Subject: [PATCH 1/2] build: Fix xsession installation dir --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a87e981..8ca83a9 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ themedir = join_paths(shelldir, 'theme') schemadir = join_paths(datadir, 'glib-2.0', 'schemas') sessiondir = join_paths(datadir, 'gnome-session', 'sessions') -xsessiondir = join_paths(datadir, 'xsession') +xsessiondir = join_paths(datadir, 'xsessions') extensionlib = files('lib/convenience.js') -- 2.14.3 From d22e603686765abc1d0ecc93f260220115cf028a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 22 Feb 2018 15:25:05 +0100 Subject: [PATCH 2/2] build: Fix classic .session definition Session files should be installed with the .session extension, not .desktop ... --- data/meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/data/meson.build b/data/meson.build index 4118d6e..a807a3d 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,11 +1,12 @@ sessions = [ - ['gnome-classic.session.desktop', sessiondir], - ['gnome-classic.desktop', xsessiondir] + ['gnome-classic.session.desktop.in', sessiondir], + ['gnome-classic.desktop.in', xsessiondir] ] foreach s : sessions + name_array = s[0].split('.') i18n.merge_file('', - input: s[0] + '.in', - output: s[0], + input: s[0], + output: '.'.join([name_array[0], name_array[1]]), po_dir: '../po', install: true, install_dir: s[1], -- 2.14.3