pyrox.dev
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@@ -7,16 +7,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@@ -3,13 +3,13 @@
30 'GPG-KEY-Hughski-Limited',
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-Vendor-Firmware-Service',
39 ],
40- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
41+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
42 )
43 endif
44
45@@ -17,12 +17,12 @@
46 install_data([
47 'LVFS-CA.pem',
48 ],
49- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
50+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
51 )
52 install_data([
53 'LVFS-CA.pem',
54 ],
55- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
56+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
57 )
58 endif
59
60--- a/data/remotes.d/meson.build
61+++ b/data/remotes.d/meson.build
62@@ -3,7 +3,7 @@
63 'lvfs.conf',
64 'lvfs-testing.conf',
65 ],
66- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
67+ install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
68 )
69 endif
70
71@@ -19,12 +19,12 @@
72 output : 'fwupd.conf',
73 configuration : con2,
74 install: true,
75- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
76+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
77 )
78 configure_file(
79 input : 'vendor.conf',
80 output : 'vendor.conf',
81 configuration : con2,
82 install: true,
83- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
84+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
85 )
86--- a/meson_post_install.sh
87+++ b/meson_post_install.sh
88@@ -11,6 +11,4 @@
89 echo 'Updating systemd deps'
90 mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants
91 ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service
92- echo 'Creating stateful directory'
93- mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd
94 #fi
95--- a/po/make-images.sh
96+++ b/po/make-images.sh
97@@ -7,6 +7,7 @@
98 #
99 install -m 0755 -d ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/
100 ${MESON_SOURCE_ROOT}/po/make-images "Installing firmware update…" ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/ ${MESON_SOURCE_ROOT}/po/LINGUAS
101+shopt -s nullglob
102 for x in ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/*/LC_IMAGES/*.bmp ; do
103 gzip -f ${x}
104 done