1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
diff --git a/data/meson.build b/data/meson.build
index 14454458..12a798c0 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,7 +17,7 @@ endif
if build_standalone
install_data(['daemon.conf'],
- install_dir : join_paths(sysconfdir, 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'fwupd')
)
endif
diff --git a/data/pki/meson.build b/data/pki/meson.build
index 94bb0b6f..1ea6a9ac 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
@@ -3,24 +3,23 @@ install_data([
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
-
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index 826a3c1d..b78db663 100644
--- a/data/remotes.d/meson.build
+++ b/data/remotes.d/meson.build
@@ -3,7 +3,7 @@ if build_daemon and get_option('lvfs')
'lvfs.conf',
'lvfs-testing.conf',
],
- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
+ install_dir : join_paths(sysconfdir_install, 'fwupd', 'remotes.d')
)
i18n.merge_file(
input: 'lvfs.metainfo.xml',
@@ -37,12 +37,12 @@ configure_file(
output : 'vendor.conf',
configuration : con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
configure_file(
input : 'vendor-directory.conf',
output : 'vendor-directory.conf',
configuration : con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index a6fb55dd..aedb7530 100644
--- a/meson.build
+++ b/meson.build
@@ -183,6 +183,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
+if get_option('sysconfdir_install') != ''
+ sysconfdir_install = join_paths(prefix, get_option('sysconfdir_install'))
+else
+ sysconfdir_install = sysconfdir
+endif
+
diffcmd = find_program('diff')
gio = dependency('gio-2.0', version : '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index 0a0e2853..198ae930 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build
index f32b97fe..679ccc7b 100644
--- a/plugins/ata/meson.build
+++ b/plugins/ata/meson.build
@@ -7,7 +7,7 @@ install_data([
)
install_data(['ata.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
shared_module('fu_plugin_ata',
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index ed4eee70..76dbdb1d 100644
--- a/plugins/dell-esrt/meson.build
+++ b/plugins/dell-esrt/meson.build
@@ -37,5 +37,5 @@ configure_file(
output : 'dell-esrt.conf',
configuration : con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
index d829e153..e2917bbe 100644
--- a/plugins/msr/meson.build
+++ b/plugins/msr/meson.build
@@ -5,7 +5,7 @@ install_data(['msr.quirk'],
)
install_data(['fwupd-msr.conf'],
- install_dir: join_paths(sysconfdir, 'modules-load.d')
+ install_dir: join_paths(sysconfdir_install, 'modules-load.d')
)
shared_module('fu_plugin_msr',
diff --git a/plugins/platform-integrity/meson.build b/plugins/platform-integrity/meson.build
index 6f1c4bc5..c5d043fc 100644
--- a/plugins/platform-integrity/meson.build
+++ b/plugins/platform-integrity/meson.build
@@ -7,7 +7,7 @@ install_data([
)
install_data(['fwupd-platform-integrity.conf'],
- install_dir: join_paths(sysconfdir, 'modules-load.d')
+ install_dir: join_paths(sysconfdir_install, 'modules-load.d')
)
shared_module('fu_plugin_platform_integrity',
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
index 92762791..08bb37ea 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',
)
install_data(['redfish.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
if get_option('tests')
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
index 6b2368fb..2bd06fed 100644
--- a/plugins/thunderbolt/meson.build
+++ b/plugins/thunderbolt/meson.build
@@ -31,7 +31,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
)
install_data(['thunderbolt.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
# we use functions from 2.52 in the tests
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
index 2d1b2d22..c4217a72 100644
--- a/plugins/uefi/meson.build
+++ b/plugins/uefi/meson.build
@@ -97,7 +97,7 @@ if get_option('man')
endif
install_data(['uefi.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
if get_option('tests')
diff --git a/plugins/upower/meson.build b/plugins/upower/meson.build
index 290a3eb6..9ab2f452 100644
--- a/plugins/upower/meson.build
+++ b/plugins/upower/meson.build
@@ -23,5 +23,5 @@ shared_module('fu_plugin_upower',
)
install_data(['upower.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
|
