@@ -1,10 +1,10 @@
11diff --git a/data/meson.build b/data/meson.build
2−index 25db9509..f394eb25 100644
2+index d59bdc88..4a4cfc35 100644
33--- a/data/meson.build
44+++ b/data/meson.build
5−@@ -13,7 +13,7 @@
6− if build_daemon
7− subdir('installed-tests')
5+@@ -16,7 +16,7 @@
6+
7+ if build_standalone
88 install_data(['daemon.conf'],
99- install_dir : join_paths(sysconfdir, 'fwupd')
1010+ install_dir : join_paths(sysconfdir_install, 'fwupd')
@@ -76,10 +76,10 @@ index 826a3c1d..b78db663 100644
7676+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
7777 )
7878diff --git a/meson.build b/meson.build
79−index 8e1de887..a5bb1fe6 100644
79+index b1a523d2..aacb8e0a 100644
8080--- a/meson.build
8181+++ b/meson.build
82−@@ -158,6 +158,12 @@
82+@@ -169,6 +169,12 @@
8383 mandir = join_paths(prefix, get_option('mandir'))
8484 localedir = join_paths(prefix, get_option('localedir'))
8585
@@ -89,14 +89,14 @@ index 8e1de887..a5bb1fe6 100644
8989+ sysconfdir_install = sysconfdir
9090+endif
9191+
92+ diffcmd = find_program('diff')
9293 gio = dependency('gio-2.0', version : '>= 2.45.8')
93− giounix = dependency('gio-unix-2.0', version : '>= 2.45.8')
94− if gio.version().version_compare ('>= 2.55.0')
94+ giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
9595diff --git a/meson_options.txt b/meson_options.txt
96−index 71b50c6a..561c2031 100644
96+index be0adfef..73983333 100644
9797--- a/meson_options.txt
9898+++ b/meson_options.txt
99−@@ -24,6 +24,7 @@
99+@@ -26,6 +26,7 @@
100100 option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
101101 option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
102102 option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
@@ -105,10 +105,10 @@ index 71b50c6a..561c2031 100644
105105 option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
106106 option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
107107diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
108−index cb9f4555..b972d7fb 100644
108+index ed4eee70..76dbdb1d 100644
109109--- a/plugins/dell-esrt/meson.build
110110+++ b/plugins/dell-esrt/meson.build
111−@@ -36,5 +36,5 @@
111+@@ -37,5 +37,5 @@
112112 output : 'dell-esrt.conf',
113113 configuration : con2,
114114 install: true,
@@ -116,10 +116,10 @@ index cb9f4555..b972d7fb 100644
116116+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
117117 )
118118diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
119−index 5c88504e..7706da71 100644
119+index 25fc5c7d..77eb9a83 100644
120120--- a/plugins/redfish/meson.build
121121+++ b/plugins/redfish/meson.build
122−@@ -26,7 +26,7 @@
122+@@ -27,7 +27,7 @@
123123 )
124124
125125 install_data(['redfish.conf'],
@@ -129,7 +129,7 @@ index 5c88504e..7706da71 100644
129129
130130 if get_option('tests')
131131diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
132−index 42718abf..bc815491 100644
132+index 06ab34ee..297a9182 100644
133133--- a/plugins/thunderbolt/meson.build
134134+++ b/plugins/thunderbolt/meson.build
135135@@ -46,7 +46,7 @@
@@ -142,10 +142,10 @@ index 42718abf..bc815491 100644
142142 # we use functions from 2.52 in the tests
143143 if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
144144diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
145−index 45b18d7d..ef8e0b04 100644
145+index 39b5f566..0f904a22 100644
146146--- a/plugins/uefi/meson.build
147147+++ b/plugins/uefi/meson.build
148−@@ -85,7 +85,7 @@
148+@@ -87,7 +87,7 @@
149149 )
150150
151151 install_data(['uefi.conf'],