diff options
| author | Jens Georg <mail@jensge.org> | 2018-12-09 14:51:14 +0100 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2018-12-09 14:55:45 +0100 |
| commit | 1532c75cd88455513f8505d57107913bd9137d5d (patch) | |
| tree | c87680d214b7230acefe6612d6d1d9bc988be33a /data | |
| parent | f7adf065708b22b59d0647d1551fc07b06860dcf (diff) | |
| download | rygel-1532c75cd88455513f8505d57107913bd9137d5d.tar.gz | |
build: Fix datadir path for meson
Diffstat (limited to 'data')
| -rw-r--r-- | data/meson.build | 8 | ||||
| -rw-r--r-- | data/xml/meson.build | 2 |
2 files changed, 7 insertions, 3 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', |