diff --git a/meson.build b/meson.build index 209d4187..58580980 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,11 @@ if not get_option('uninstalled') 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')) + if get_option('sysconfdir_install') != '' + rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir_install')) + else + rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) + endif rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets') @@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir) -conf.set_quoted('SYS_CONFIG_DIR', rygel_sysconfdir) +conf.set_quoted('SYS_CONFIG_DIR', get_option('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(get_option('prefix'), get_option('datadir'), 'applications')) diff --git a/meson_options.txt b/meson_options.txt index f09cac58..ff11c548 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,7 @@ option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker']) option('engines', type : 'array', choices : ['simple', 'gstreamer']) option('examples', type : 'boolean', value : 'true')