X-Git-Url: https://git.sesse.net/?p=plocate;a=blobdiff_plain;f=meson.build;h=16ff3ecdc86966c1c17702c9770ea588125fddf8;hp=36e74cda4983e6804478b71e25a7a42d08af1211;hb=HEAD;hpb=10a0c6721271d18b068b8328b16875aacbad0a84

diff --git a/meson.build b/meson.build
index 36e74cd..b5a2e36 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.5')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.22')
 
 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,
@@ -77,12 +77,17 @@ updatedb_conf_man = configure_file(input: 'updatedb.conf.5.in',
 install_man(updatedb_conf_man)
 
 if get_option('install_systemd')
-	systemd = dependency('systemd', required: false)
-	if systemd.found()
-		unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+	unitdir = get_option('systemunitdir')
+	if unitdir == ''
+		systemd = dependency('systemd', required: false)
+		if systemd.found()
+			unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+		endif
+	endif
+	if unitdir != ''
 		updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
-		       output: 'plocate-updatedb.service',
-		       configuration: conf_data)
+			output: 'plocate-updatedb.service',
+			configuration: conf_data)
 		install_data(updatedb_service, install_dir: unitdir)
 		install_data('plocate-updatedb.timer', install_dir: unitdir)
 	endif
@@ -93,11 +98,11 @@ 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))
-	executable('bench', ['bench.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp'],
+	executable('bench', ['bench.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp', 'complete_pread.cpp'],
 		dependencies: [uringdep, turbopfordep],
 		build_by_default: false,
 		install: false)