From db80346f0412329379cfde7a6aa0de8fd731ce4a Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 12 Oct 2020 00:22:38 +0200 Subject: [PATCH] Make update-plocate.sh work properly if installed to /usr. --- meson.build | 6 ++++++ update-plocate.sh | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8a67ae7..3521fd5 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,12 @@ executable('plocate-build', 'plocate-build.cpp', install: true, install_dir: get_option('sbindir')) +conf_data = configuration_data() +conf_data.set('sbindir', get_option('prefix') + '/' + get_option('sbindir')) +configure_file(input: 'update-plocate.sh', + output: 'update-plocate.sh', + configuration: conf_data) + install_data('update-plocate.sh', install_dir: '/etc/cron.daily', rename: 'plocate') diff --git a/update-plocate.sh b/update-plocate.sh index 3f88c7d..2c1e2d8 100755 --- a/update-plocate.sh +++ b/update-plocate.sh @@ -2,6 +2,9 @@ set -e -/usr/local/sbin/plocate-build /var/lib/mlocate/mlocate.db /var/lib/mlocate/plocate.db.new +SBINDIR=@sbindir@ +[ -d $SBINDIR ] || SBINDIR=/usr/local/sbin # Default if not processed by Meson. + +$SBINDIR/plocate-build /var/lib/mlocate/mlocate.db /var/lib/mlocate/plocate.db.new chgrp mlocate /var/lib/mlocate/plocate.db.new mv /var/lib/mlocate/plocate.db.new /var/lib/mlocate/plocate.db -- 2.39.2