X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=69d49f12b956db8adef50f4b3112eabf5db91381;hb=7f39444852308224240ebfb75e0bf8f39403afa0;hp=c18f42494dfec75f866aa893699a3d71d5629bb4;hpb=8678b071001b8cfb5b6915bfe3db7189a4047035;p=plocate

diff --git a/meson.build b/meson.build
index c18f424..69d49f1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,8 @@
-project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.14-pre')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.19-pre')
 
 add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp')
 add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp')
-dbdir = join_paths(get_option('sharedstatedir'), 'plocate')
-dbfile = join_paths(dbdir, 'plocate.db')
+dbfile = join_paths(get_option('sharedstatedir'), get_option('dbpath'))
 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')
@@ -56,7 +55,8 @@ update_script = configure_file(input: 'update-plocate.sh',
                output: 'update-plocate.sh',
                configuration: conf_data)
 
-meson.add_install_script('mkdir.sh', dbdir)
+fs = import('fs')
+meson.add_install_script('mkdir.sh', fs.parent(dbfile))
 
 if get_option('install_cron')
 	install_data(update_script,
@@ -98,7 +98,7 @@ endif
 # of calling into that directory to run make, and we're not
 # replicating their build system, so it has to be manual.
 pfordir = meson.source_root() + '/TurboPFor-Integer-Compression'
-if run_command('[', '-r', pfordir + '/libic.a', ']').returncode() == 0
+if run_command('[', '-r', pfordir + '/libic.a', ']', check: false).returncode() == 0
 	turbopfordep = declare_dependency(
 		include_directories: include_directories('TurboPFor-Integer-Compression'),
 		dependencies: meson.get_compiler('cpp').find_library('ic', dirs: pfordir))