pyrox.dev
lol
1--- a/data/builder/meson.build
2+++ b/data/builder/meson.build
3@@ -1,3 +0,0 @@
4-install_data('README.md',
5- install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
6-)
7--- a/data/meson.build
8+++ b/data/meson.build
9@@ -8,16 +8,12 @@
10 subdir('installed-tests')
11 endif
12
13-install_data(['daemon.conf'],
14- install_dir : join_paths(sysconfdir, 'fwupd')
15-)
16-
17 install_data(['org.freedesktop.fwupd.metainfo.xml'],
18 install_dir: join_paths(datadir, 'metainfo')
19 )
20
21 install_data(['org.freedesktop.fwupd.conf'],
22- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
23+ install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
24 )
25
26 install_data(['metadata.xml'],
27--- a/data/pki/meson.build
28+++ b/data/pki/meson.build
29@@ -4,14 +4,14 @@
30 'GPG-KEY-Linux-Foundation-Firmware',
31 'GPG-KEY-Linux-Vendor-Firmware-Service',
32 ],
33- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
34+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
35 )
36
37 install_data([
38 'GPG-KEY-Linux-Foundation-Metadata',
39 'GPG-KEY-Linux-Vendor-Firmware-Service',
40 ],
41- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
42+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
43 )
44 endif
45
46@@ -19,12 +19,12 @@
47 install_data([
48 'LVFS-CA.pem',
49 ],
50- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
51+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
52 )
53 install_data([
54 'LVFS-CA.pem',
55 ],
56- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
57+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
58 )
59 endif
60
61--- a/data/remotes.d/meson.build
62+++ b/data/remotes.d/meson.build
63@@ -3,7 +3,7 @@
64 'lvfs.conf',
65 'lvfs-testing.conf',
66 ],
67- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
68+ install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
69 )
70 i18n.merge_file(
71 input: 'lvfs.metainfo.xml',
72@@ -37,12 +37,12 @@
73 output : 'fwupd.conf',
74 configuration : con2,
75 install: true,
76- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
77+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
78 )
79 configure_file(
80 input : 'vendor.conf',
81 output : 'vendor.conf',
82 configuration : con2,
83 install: true,
84- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
85+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
86 )
87--- a/meson_post_install.sh
88+++ b/meson_post_install.sh
89@@ -11,6 +11,4 @@
90 echo 'Updating systemd deps'
91 mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants
92 ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service
93- echo 'Creating stateful directory'
94- mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd
95 #fi