In plocate-build, open the file only once.

[plocate] / meson.build

diff --git a/meson.build b/meson.build
index 641a056272d1f632e9fe16bcf80fd2b4c9a96550..2e2761a78a3b1d91224bbac3a74446a56afe2c35 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.0.1')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.0.3-pre')
 
 # Make the version available as a #define.
 add_project_arguments('-DPLOCATE_VERSION="' + meson.project_version() + '"', language: 'cpp')
@@ -21,14 +21,18 @@ executable('plocate-build', 'plocate-build.cpp',
        install_dir: get_option('sbindir'))
 
 conf_data = configuration_data()
+conf_data.set('PROCESSED_BY_MESON', '1')
 conf_data.set('sbindir', get_option('prefix') + '/' + get_option('sbindir'))
-configure_file(input: 'update-plocate.sh',
+conf_data.set('locategroup', get_option('locategroup'))
+update_script = configure_file(input: 'update-plocate.sh',
                output: 'update-plocate.sh',
                configuration: conf_data)
 
-install_data('update-plocate.sh',
-       install_dir: '/etc/cron.daily',
-       rename: 'plocate')
+if get_option('install_cron')
+       install_data(update_script,
+               install_dir: '/etc/cron.daily',
+               rename: 'plocate')
+endif
 install_man('plocate.1')
 install_man('plocate-build.8')
 
@@ -41,7 +45,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'],
+       executable('bench', ['bench.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp'],
                dependencies: [uringdep, turbopfordep],
                build_by_default: false,
                install: false)