Send the result value of the stat to the callback.

[plocate] / meson.build

diff --git a/meson.build b/meson.build
index 2fcd7e0489acb8ffa9875040257e3e049bcd28c0..16ff3ecdc86966c1c17702c9770ea588125fddf8 100644 (file)
--- 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.9-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,15 +77,16 @@ 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')
-               updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
-                      output: 'plocate-updatedb.service',
-                      configuration: conf_data)
-               install_data(updatedb_service, install_dir: unitdir)
-               install_data('plocate-updatedb.timer', install_dir: unitdir)
+       unitdir = get_option('systemunitdir')
+       if unitdir == ''
+               unitdir = dependency('systemd').get_pkgconfig_variable('systemdsystemunitdir')
        endif
+
+       updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
+               output: 'plocate-updatedb.service',
+               configuration: conf_data)
+       install_data(updatedb_service, install_dir: unitdir)
+       install_data('plocate-updatedb.timer', install_dir: unitdir)
 endif
 
 # Requires having TurboPFor checked out, so not built by default.