pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch

   1 diff --git a/data/meson.build b/data/meson.build
   2 index b22ff55..01c5910 100644
   3 --- a/data/meson.build
   4 +++ b/data/meson.build
   5 @@ -1,6 +1,6 @@
   6  if get_option('enable-backend')
   7      conf = configuration_data()
   8 -    conf.set('sysconfdir', sysconfdir)
   9 +    conf.set('sysconfdir', sysconfdir_install)
  10
  11      if get_option('demo-agent')
  12          conf.set('demo_agent', 'geoclue-demo-agent;')
  13 @@ -14,7 +14,7 @@ if get_option('enable-backend')
  14          conf.set('default_wifi_enable', 'false')
  15      endif
  16
  17 -    conf_dir = join_paths(sysconfdir, 'geoclue')
  18 +    conf_dir = join_paths(sysconfdir_install, 'geoclue')
  19      configure_file(output: 'geoclue.conf',
  20                     input: 'geoclue.conf.in',
  21                     configuration: conf,
  22 @@ -23,7 +23,7 @@ if get_option('enable-backend')
  23      conf = configuration_data()
  24      conf.set('libexecdir', libexecdir)
  25      conf.set('dbus_srv_user', get_option('dbus-srv-user'))
  26 -    conf.set('sysconfdir', sysconfdir)
  27 +    conf.set('sysconfdir', sysconfdir_install)
  28
  29      confd_dir = join_paths(conf_dir, 'conf.d')
  30      install_emptydir(confd_dir)
  31 diff --git a/demo/meson.build b/demo/meson.build
  32 index 1427fbe..2623f16 100644
  33 --- a/demo/meson.build
  34 +++ b/demo/meson.build
  35 @@ -54,7 +54,7 @@ if get_option('demo-agent')
  36                                     install_dir: desktop_dir)
  37
  38      # Also install in the autostart directory.
  39 -    autostart_dir = join_paths(sysconfdir, 'xdg', 'autostart')
  40 +    autostart_dir = join_paths(sysconfdir_install, 'xdg', 'autostart')
  41      meson.add_install_script('install-file.py',
  42                               desktop_file.full_path(),
  43                               autostart_dir)
  44 diff --git a/meson.build b/meson.build
  45 index c561572..bca0cb3 100644
  46 --- a/meson.build
  47 +++ b/meson.build
  48 @@ -13,6 +13,11 @@ datadir = join_paths(get_option('prefix'), get_option('datadir'))
  49  includedir = join_paths(get_option('prefix'), get_option('includedir'))
  50  libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
  51  sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
  52 +if get_option('sysconfdir_install') != ''
  53 +  sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
  54 +else
  55 +  sysconfdir_install = sysconfdir
  56 +endif
  57  localedir = join_paths(datadir, 'locale')
  58
  59  header_dir = 'libgeoclue-' + gclue_api_version
  60 diff --git a/meson_options.txt b/meson_options.txt
  61 index 4d55a63..682b39c 100644
  62 --- a/meson_options.txt
  63 +++ b/meson_options.txt
  64 @@ -31,6 +31,9 @@ option('enable-backend',
  65  option('demo-agent',
  66         type: 'boolean', value: true,
  67         description: 'Build demo agent')
  68 +option('sysconfdir_install',
  69 +       type: 'string', value: '',
  70 +       description: 'sysconfdir to use during installation')
  71  option('dbus-sys-dir',
  72         type: 'string',
  73         description: 'where D-BUS system.d directory is')