X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=435cd0a296518033fe67539a6732031a759c9776;hb=79aecbbaa7dd7ada26a86ffaabf3c11a3b599158;hp=2fcd7e0489acb8ffa9875040257e3e049bcd28c0;hpb=c9a2810021399c2b6b8219d94040d790f558adf5;p=plocate

diff --git a/meson.build b/meson.build
index 2fcd7e0..435cd0a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.1')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.15-pre')
 
 add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp')
 add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp')
@@ -39,7 +39,8 @@ executable('plocate-build', ['plocate-build.cpp', 'database-builder.cpp'],
 	dependencies: [zstddep],
 	install: true,
 	install_dir: get_option('sbindir'))
-executable('updatedb', ['updatedb.cpp', 'database-builder.cpp', 'conf.cpp', 'lib.cpp', 'bind-mount.cpp', 'complete_pread.cpp'],
+updatedb_progname = get_option('updatedb_progname')
+executable(updatedb_progname, ['updatedb.cpp', 'database-builder.cpp', 'conf.cpp', 'lib.cpp', 'bind-mount.cpp', 'complete_pread.cpp'],
 	dependencies: [zstddep, threaddep],
 	install: true,
 	install_dir: get_option('sbindir'))
@@ -50,6 +51,7 @@ conf_data.set('sbindir', join_paths(get_option('prefix'), get_option('sbindir'))
 conf_data.set('groupname', get_option('locategroup'))
 conf_data.set('dbfile', dbfile)
 conf_data.set('updatedb_conf', '/etc/updatedb.conf')
+conf_data.set('updatedb_progname', updatedb_progname)
 update_script = configure_file(input: 'update-plocate.sh',
                output: 'update-plocate.sh',
                configuration: conf_data)
@@ -65,7 +67,7 @@ install_man('plocate.1')
 install_man('plocate-build.8')
 
 updatedb_man = configure_file(input: 'updatedb.8.in',
-               output: 'updatedb.8',
+               output: updatedb_progname + '.8',
                configuration: conf_data)
 install_man(updatedb_man)
 
@@ -75,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
@@ -95,7 +102,7 @@ if run_command('[', '-r', pfordir + '/libic.a', ']').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)