talkatu/talkatu

meson: Replace join_paths by /.

2020-09-15, Elliott Sales de Andrade
0f10848ece7a
Parents bf39ae959edc
Children b8f1e12f028f
meson: Replace join_paths by /.

It was added in 0.49.0, and we require 0.50.0.

Reviewed at https://reviews.imfreedom.org/r/118/
3 files changed, 7 insertions(+), 7 deletions(-)
  • +1 -1
    demo/meson.build
  • +2 -2
    meson.build
  • +4 -4
    talkatu/meson.build
    • --- a/demo/meson.build Mon Sep 14 20:34:11 2020 -0500
    +++ b/demo/meson.build Tue Sep 15 23:48:38 2020 -0500
    @@ -37,5 +37,5 @@
    talkatudemo],
    output : 'talkatu-demo.1',
    install : true,
    - install_dir : join_paths(get_option('mandir'), 'man1'))
    + install_dir : get_option('mandir') / 'man1')
    endif
    --- a/meson.build Mon Sep 14 20:34:11 2020 -0500
    +++ b/meson.build Tue Sep 15 23:48:38 2020 -0500
    @@ -22,7 +22,7 @@
    version_conf.set('TALKATU_EXTRA_VERSION', extra)
    version_conf.set('TALKATU_VERSION', meson.project_version())
    -LOCALE_DIR = join_paths(get_option('prefix'), get_option('localedir'))
    +LOCALE_DIR = get_option('prefix') / get_option('localedir')
    add_project_arguments('-DLOCALEDIR="@0@"'.format(LOCALE_DIR), language : 'c')
    ###############################################################################
    @@ -107,5 +107,5 @@
    ###############################################################################
    # documentation
    install_data('ChangeLog', 'INSTALL', 'README.md', 'HACKING', 'logo.png',
    - install_dir : join_paths(get_option('datadir'), 'doc', 'talkatu'),
    + install_dir : get_option('datadir') / 'doc/talkatu',
    )
    --- a/talkatu/meson.build Mon Sep 14 20:34:11 2020 -0500
    +++ b/talkatu/meson.build Tue Sep 15 23:48:38 2020 -0500
    @@ -111,7 +111,7 @@
    output : 'talkatuversion.h',
    configuration : version_conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'talkatu-1.0', 'talkatu'))
    + install_dir : get_option('includedir') / 'talkatu-1.0/talkatu')
    TALKATU_PUBLIC_BUILT_HEADERS += [talkatuversion_h]
    @@ -122,7 +122,7 @@
    'talkatuenums',
    sources : TALKATU_ENUM_HEADERS,
    install_header : true,
    - install_dir : join_paths(get_option('includedir'), 'talkatu-1.0/talkatu'))
    + install_dir : get_option('includedir') / 'talkatu-1.0/talkatu')
    talkatuenums_c = talkatuenums[0]
    talkatuenums_h = talkatuenums[1]
    @@ -154,7 +154,7 @@
    output : 'talkatu.h',
    configuration : conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'talkatu-1.0'))
    + install_dir : get_option('includedir') / 'talkatu-1.0')
    ###############################################################################
    # Library target
    @@ -222,7 +222,7 @@
    ###############################################################################
    install_data(
    'talkatu.xml',
    - install_dir : join_paths(get_option('datadir'), 'glade', 'catalogs'))
    + install_dir : get_option('datadir') / 'glade/catalogs')
    ###############################################################################
    # Install Stuff