@@ -1,30 +1,21 @@
11diff --git a/data/meson.build b/data/meson.build
2−index 61664cd6..f10abbba 100644
2+index 25db9509..f394eb25 100644
33--- a/data/meson.build
44+++ b/data/meson.build
5−@@ -11,7 +11,7 @@ if get_option('daemon')
5+@@ -13,7 +13,7 @@
6+ if build_daemon
7+ subdir('installed-tests')
8+ install_data(['daemon.conf'],
9+- install_dir : join_paths(sysconfdir, 'fwupd')
10++ install_dir : join_paths(sysconfdir_install, 'fwupd')
11+ )
612 endif
713
8− install_data(['daemon.conf'],
9−- install_dir : join_paths(sysconfdir, 'fwupd')
10−+ install_dir : join_paths(sysconfdir_install, 'fwupd')
11− )
12−
13− install_data(['org.freedesktop.fwupd.metainfo.xml'],
14−@@ -23,7 +23,7 @@ install_data(['org.freedesktop.fwupd.svg'],
15− )
16−
17− install_data(['org.freedesktop.fwupd.conf'],
18−- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
19−+ install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d')
20− )
21−
22− if get_option('daemon')
2314diff --git a/data/pki/meson.build b/data/pki/meson.build
2415index eefcc914..dc801fa1 100644
2516--- a/data/pki/meson.build
2617+++ b/data/pki/meson.build
27−@@ -4,14 +4,14 @@ if get_option('gpg')
18+@@ -4,14 +4,14 @@
2819 'GPG-KEY-Linux-Foundation-Firmware',
2920 'GPG-KEY-Linux-Vendor-Firmware-Service',
3021 ],
@@ -41,7 +32,7 @@ index eefcc914..dc801fa1 100644
4132 )
4233 endif
4334
44−@@ -19,12 +19,12 @@ if get_option('pkcs7')
35+@@ -19,12 +19,12 @@
4536 install_data([
4637 'LVFS-CA.pem',
4738 ],
@@ -57,10 +48,10 @@ index eefcc914..dc801fa1 100644
5748 endif
5849
5950diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
60−index a27c31ef..374e09b6 100644
51+index 826a3c1d..b78db663 100644
6152--- a/data/remotes.d/meson.build
6253+++ b/data/remotes.d/meson.build
63−@@ -3,7 +3,7 @@ if get_option('daemon') and get_option('lvfs')
54+@@ -3,7 +3,7 @@
6455 'lvfs.conf',
6556 'lvfs-testing.conf',
6657 ],
@@ -69,7 +60,7 @@ index a27c31ef..374e09b6 100644
6960 )
7061 i18n.merge_file(
7162 input: 'lvfs.metainfo.xml',
72−@@ -37,12 +37,12 @@ configure_file(
63+@@ -37,12 +37,12 @@
7364 output : 'vendor.conf',
7465 configuration : con2,
7566 install: true,
@@ -85,10 +76,10 @@ index a27c31ef..374e09b6 100644
8576+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
8677 )
8778diff --git a/meson.build b/meson.build
88−index a89f9b3f..736896eb 100644
79+index 8e1de887..a5bb1fe6 100644
8980--- a/meson.build
9081+++ b/meson.build
91−@@ -145,6 +145,12 @@ localstatedir = join_paths(prefix, get_option('localstatedir'))
82+@@ -158,6 +158,12 @@
9283 mandir = join_paths(prefix, get_option('mandir'))
9384 localedir = join_paths(prefix, get_option('localedir'))
9485
@@ -99,13 +90,13 @@ index a89f9b3f..736896eb 100644
9990+endif
10091+
10192 gio = dependency('gio-2.0', version : '>= 2.45.8')
93+ giounix = dependency('gio-unix-2.0', version : '>= 2.45.8')
10294 if gio.version().version_compare ('>= 2.55.0')
103− conf.set('HAVE_GIO_2_55_0', '1')
10495diff --git a/meson_options.txt b/meson_options.txt
105−index 5d4163e8..db81fd1f 100644
96+index 71b50c6a..561c2031 100644
10697--- a/meson_options.txt
10798+++ b/meson_options.txt
108−@@ -21,6 +21,7 @@ option('plugin_modem_manager', type : 'boolean', value : false, description : 'e
99+@@ -24,6 +24,7 @@
109100 option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
110101 option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
111102 option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
@@ -117,7 +108,7 @@ diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
117108index cb9f4555..b972d7fb 100644
118109--- a/plugins/dell-esrt/meson.build
119110+++ b/plugins/dell-esrt/meson.build
120−@@ -36,5 +36,5 @@ configure_file(
111+@@ -36,5 +36,5 @@
121112 output : 'dell-esrt.conf',
122113 configuration : con2,
123114 install: true,
@@ -128,7 +119,7 @@ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
128119index 5c88504e..7706da71 100644
129120--- a/plugins/redfish/meson.build
130121+++ b/plugins/redfish/meson.build
131−@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',
122+@@ -26,7 +26,7 @@
132123 )
133124
134125 install_data(['redfish.conf'],
@@ -137,11 +128,24 @@ index 5c88504e..7706da71 100644
137128 )
138129
139130 if get_option('tests')
131+diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
132+index 42718abf..bc815491 100644
133+--- a/plugins/thunderbolt/meson.build
134++++ b/plugins/thunderbolt/meson.build
135+@@ -46,7 +46,7 @@
136+ )
137+
138+ install_data(['thunderbolt.conf'],
139+- install_dir: join_paths(sysconfdir, 'fwupd')
140++ install_dir: join_paths(sysconfdir_install, 'fwupd')
141+ )
142+ # we use functions from 2.52 in the tests
143+ if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
140144diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
141−index ac9f5dd8..1ab51b5e 100644
145+index 45b18d7d..ef8e0b04 100644
142146--- a/plugins/uefi/meson.build
143147+++ b/plugins/uefi/meson.build
144−@@ -79,7 +79,7 @@ executable(
148+@@ -85,7 +85,7 @@
145149 )
146150
147151 install_data(['uefi.conf'],