Move to our own directory and group.

diff --git a/meson.build b/meson.build
index feb6c5a57f7c27a994189c2c36146acd4cb32449..24c7bbc9d33965f04763c55ad5aa24dc89b761b2 100644 (file)
--- 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 4bc9bd8ad58af41c92f0037cd3620f58da30ef4f..3e2f6ccd7b8d1c67e7b751c8949bc0b273f44350 100644 (file)
--- 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 d4bafc31f889ea7a4204e295b7a1f69ef3d5fb86..5d7b402af56b4428a4fbee190444bca33b2d6f1f 100755 (executable)
--- 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