X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=78435640816730a3541c13f52c8cdcf50b911919;hb=46e9aad1339d6d3dd3dc04181730fab2ce0e8ced;hp=b963c03db8209cc28bb6662216faa5ecdd48a714;hpb=8a5857967a61958269e7f58a93913ab7fdab7bb8;p=plocate

diff --git a/meson.build b/meson.build
index b963c03..7843564 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.0.8-pre')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.4-pre')
 
 add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp')
 add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp')
@@ -34,12 +34,13 @@ endif
 executable('plocate', ['plocate.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp', 'parse_trigrams.cpp', 'serializer.cpp', 'access_rx_cache.cpp', 'needle.cpp', 'complete_pread.cpp'],
 	dependencies: [uringdep, zstddep, threaddep, atomicdep],
 	install: true,
-	install_mode: ['rwxr-sr-x', 'root', 'mlocate'])
+	install_mode: ['rwxr-sr-x', 'root', get_option('locategroup')])
 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'))
@@ -47,13 +48,15 @@ executable('updatedb', ['updatedb.cpp', 'database-builder.cpp', 'conf.cpp', 'lib
 conf_data = configuration_data()
 conf_data.set('PROCESSED_BY_MESON', '1')
 conf_data.set('sbindir', join_paths(get_option('prefix'), get_option('sbindir')))
-conf_data.set('locategroup', get_option('locategroup'))
+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)
 
-meson.add_install_script('mkdir', '-p', dbdir)
+meson.add_install_script('mkdir.sh', dbdir)
 
 if get_option('install_cron')
 	install_data(update_script,
@@ -63,6 +66,16 @@ endif
 install_man('plocate.1')
 install_man('plocate-build.8')
 
+updatedb_man = configure_file(input: 'updatedb.8.in',
+               output: updatedb_progname + '.8',
+               configuration: conf_data)
+install_man(updatedb_man)
+
+updatedb_conf_man = configure_file(input: 'updatedb.conf.5.in',
+               output: 'updatedb.conf.5',
+               configuration: conf_data)
+install_man(updatedb_conf_man)
+
 if get_option('install_systemd')
 	systemd = dependency('systemd', required: false)
 	if systemd.found()