From: Nikolaus Rath Date: Wed, 21 Jun 2017 22:41:37 +0000 (-0700) Subject: Install init script in $DESTDIR/etc, not $prefix/$sysconfdir X-Git-Tag: fuse-3.1.0~10 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b400c4f95b9fc0e62d6020e2344174943a25e492;p=qemu-gpiodev%2Flibfuse.git Install init script in $DESTDIR/etc, not $prefix/$sysconfdir Fixes: #178. --- diff --git a/ChangeLog.rst b/ChangeLog.rst index 285ef5a..38a1cf6 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,8 @@ Unreleased Changes ================== +* The init script is now installed into the right location + ($DESTDIR/etc/init.d rather than $prefix/$sysconfdir/init.d) * The `example/passthrough_ll` filesystem now supports creating and writing to files. * `fuse_main()` / `fuse_remove_signal_handlers()`: do not reset diff --git a/util/install_helper.sh b/util/install_helper.sh index fe65c1c..9b53530 100755 --- a/util/install_helper.sh +++ b/util/install_helper.sh @@ -22,11 +22,13 @@ install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ "${prefix}/lib/udev/rules.d/99-fuse3.rules" install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ - "${prefix}/${sysconfdir}/init.d/fuse3" + "${DESTDIR}/etc/init.d/fuse3" -if test -x /usr/sbin/update-rc.d; then - # May fail for a DESTDIR installation +if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true +else + echo "== FURTHER ACTION REQUIRED ==" + echo "Make sure that your init system will start the ${DESTDIR}/etc/init.d/fuse3 init script" fi