Revert "Make entire path for plocate database configurable"

Breaks configure.

This reverts commit d45acc377040e80dc517dbdcbf3cfcb06eab8c09.

diff --git a/meson.build b/meson.build
index 8dc23935acac7e0a580b991378f05563b2e589c2..435cd0a296518033fe67539a6732031a759c9776 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,8 @@ 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')
-dbfile = join_paths(get_option('sharedstatedir'), get_option('dbpath'))
+dbdir = join_paths(get_option('sharedstatedir'), 'plocate')
+dbfile = join_paths(dbdir, 'plocate.db')
 add_project_arguments('-DDBFILE="' + dbfile + '"', language: 'cpp')
 add_project_arguments('-DPACKAGE_NAME="plocate"', language: 'cpp')
 add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', language: 'cpp')

diff --git a/meson_options.txt b/meson_options.txt
index a9f3358898d3bfa8817ac3c80c9b6e9037d38e6b..8ac13c5106b9abda5ee97b3b4e6499279e0580e9 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,4 +3,3 @@ option('install_systemd', type: 'boolean', value: true, description: 'Install sy
 option('systemunitdir', type: 'string', description: 'Where to install systemd units to (default: autodetect)')
 option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file')
 option('updatedb_progname', type: 'string', value: 'updatedb', description: 'Binary name of updatedb')
-option('dbpath', type: 'string', value: 'plocate/plocate.db', description: 'Path to plocate database relative to "sharedstatedir"')