From d8d3ee5c809020d1188059cec1d4add3137b33a9 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 28 Nov 2020 20:57:03 +0100 Subject: [PATCH] Move to our own directory and group. --- meson.build | 2 +- meson_options.txt | 2 +- update-plocate.sh | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index feb6c5a..24c7bbc 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std= add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp') add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp') -add_project_arguments('-DDBFILE="/var/lib/mlocate/plocate.db"', language: 'cpp') +add_project_arguments('-DDBFILE="/var/lib/plocate/plocate.db"', language: 'cpp') add_project_arguments('-DPACKAGE_NAME="plocate"', language: 'cpp') add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', language: 'cpp') add_project_arguments('-DPACKAGE_BUGREPORT="steinar+plocate@gunderson.no"', language: 'cpp') diff --git a/meson_options.txt b/meson_options.txt index 4bc9bd8..3e2f6cc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,2 @@ option('install_cron', type: 'boolean', value: true, description: 'Install update script into /etc/cron.daily') -option('locategroup', type: 'string', value: 'mlocate', description: 'Group that the install script will use for the .db file') +option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file') diff --git a/update-plocate.sh b/update-plocate.sh index d4bafc3..5d7b402 100755 --- a/update-plocate.sh +++ b/update-plocate.sh @@ -7,9 +7,9 @@ if [ @PROCESSED_BY_MESON@ = 1 ]; then LOCATEGROUP=@locategroup@ else SBINDIR=/usr/local/sbin - LOCATEGROUP=mlocate + LOCATEGROUP=plocate fi -$SBINDIR/plocate-build /var/lib/mlocate/mlocate.db /var/lib/mlocate/plocate.db.new -chgrp $LOCATEGROUP /var/lib/mlocate/plocate.db.new -mv /var/lib/mlocate/plocate.db.new /var/lib/mlocate/plocate.db +$SBINDIR/plocate-build /var/lib/mlocate/mlocate.db /var/lib/plocate/plocate.db.new +chgrp $LOCATEGROUP /var/lib/plocate/plocate.db.new +mv /var/lib/plocate/plocate.db.new /var/lib/plocate/plocate.db -- 2.39.2