Merge pull request #330634 from r-ryantm/auto-update/circumflex
[NixPkgs.git] / pkgs / servers / hqplayerd / add-option-for-installation-sysconfdir.patch
blobd2319ec13ed3ef02e85b9a5f80b6c643e8c7c292
1 diff --git a/meson.build b/meson.build
2 index 8af2fcf9..0e318307 100644
3 --- a/meson.build
4 +++ b/meson.build
5 @@ -22,7 +22,11 @@ if not get_option('uninstalled')
6 rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel')
7 rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'),
8 'rygel')
9 - rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
10 + if get_option('sysconfdir_install') != ''
11 + rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
12 + else
13 + rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
14 + endif
15 rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
16 rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
17 rygel_presetdir = join_paths(rygel_datadir, 'presets')
18 @@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
19 conf.set_quoted('PLUGIN_DIR', rygel_plugindir)
20 conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir)
21 conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir)
22 -conf.set_quoted('SYS_CONFIG_DIR', rygel_sysconfdir)
23 +conf.set_quoted('SYS_CONFIG_DIR', get_option('sysconfdir'))
24 conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
25 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract'))
26 conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications'))
27 diff --git a/meson_options.txt b/meson_options.txt
28 index fd04776a..3dee43ba 100644
29 --- a/meson_options.txt
30 +++ b/meson_options.txt
31 @@ -1,3 +1,4 @@
32 +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
33 option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only')
34 option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation')
35 option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages')