[rygel] build: Fix datadir path for meson

[Jens Georg <jensgeorg src gnome org>]

commit 1532c75cd88455513f8505d57107913bd9137d5d
Author: Jens Georg <mail jensge org>
Date:   Sun Dec 9 14:51:14 2018 +0100

    build: Fix datadir path for meson

 data/meson.build     | 8 ++++++--
 data/xml/meson.build | 2 +-
 meson.build          | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index f686c1ce..3d97ff83 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -9,7 +9,7 @@ install_data(join_paths('icons', '48x48', 'rygel.png'), install_dir : join_paths
 install_data(join_paths('icons', 'scalable', 'rygel.svg'), install_dir : join_paths(rygel_icondir, 
'scalable', 'apps'))
 install_data(join_paths('icons', 'scalable', 'rygel-full.svg'), install_dir : join_paths(rygel_icondir, 
'scalable', 'apps'))
 
-install_data('rygel-preferences.ui', install_dir : join_paths(rygel_datadir, 'rygel'))
+install_data('rygel-preferences.ui', install_dir : rygel_datadir)
 
 data_conf = configuration_data()
 data_conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
@@ -18,7 +18,11 @@ data_conf.set('VERSION', meson.project_version())
 configure_file(input: 'org.gnome.Rygel1.service.in',
                output: 'org.gnome.Rygel1.service',
                configuration: data_conf,
-               install_dir : join_paths(rygel_datadir, 'dbus-1', 'services'))
+               install_dir : join_paths(
+                   get_option('prefix'),
+                   get_option('datadir'),
+                   'dbus-1/services')
+               )
 
 systemd = dependency('systemd', required : false)
 systemd_user_unit_dir = join_paths(get_option('prefix'), 'lib/systemd/user/')
diff --git a/data/xml/meson.build b/data/xml/meson.build
index 85c0d740..f4224917 100644
--- a/data/xml/meson.build
+++ b/data/xml/meson.build
@@ -1,5 +1,5 @@
 xml_processor = find_program('process-xml.py')
-xml_dir = join_paths(rygel_datadir, 'rygel', 'xml')
+xml_dir = join_paths(rygel_datadir, 'xml')
 
 server_xml = configure_file(input: 'MediaServer3.xml.in.in',
                output: 'MediaServer3.xml.in',
diff --git a/meson.build b/meson.build
index 9ea273a7..9553c13d 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@ rygel_includedir = join_paths(get_option('includedir'), 'rygel-2.6')
 rygel_vapidir = join_paths(get_option('prefix'), get_option('datadir'), 'vala/vapi')
 
 if not get_option('uninstalled')
-    rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'))
+    rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel')
     rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'),
     'rygel')
     rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
@@ -59,7 +59,7 @@ conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir)
 conf.set_quoted('SYS_CONFIG_DIR', rygel_sysconfdir)
 conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract'))
-conf.set_quoted('DESKTOP_DIR', join_paths(rygel_datadir, 'applications'))
+conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications'))
 conf.set_quoted('VERSION', meson.project_version())
 config_include = include_directories('.')