tjh.dev
1--- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200
2+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200
3@@ -22,30 +22,11 @@
4 DESTDIR="${DESTDIR%/}"
5 fi
6
7-chown root:root "${DESTDIR}${bindir}/fusermount3"
8-chmod u+s "${DESTDIR}${bindir}/fusermount3"
9-
10 install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
11 "${DESTDIR}${sysconfdir}/fuse.conf"
12
13-
14-if test ! -e "${DESTDIR}/dev/fuse"; then
15- mkdir -p "${DESTDIR}/dev"
16- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
17-fi
18-
19 install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
20- "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
21+ "${sysconfdir}/udev/rules.d/99-fuse3.rules"
22
23 install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
24 "${DESTDIR}${sysconfdir}/init.d/fuse3"
25-
26-
27-if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
28- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
29-else
30- echo "== FURTHER ACTION REQUIRED =="
31- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
32-fi
33-
34-
35diff --git a/util/meson.build b/util/meson.build
36index aa0e734..06d4378 100644
37--- a/util/meson.build
38+++ b/util/meson.build
39@@ -1,4 +1,4 @@
40-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf')
41+fuseconf_path = join_paths('/', get_option('sysconfdir'), 'fuse.conf')
42
43 executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'],
44 include_directories: include_dirs,