gplugin/gplugin

Use join_paths for anything passed to meson.
feature/meson
2016-12-18, Elliott Sales de Andrade
d26cddd1c7fc
Parents 67310e92c974
Children 4acfec6624be
Use join_paths for anything passed to meson.

I didn't apply this on paths in compiler defines because they'd
probably need escaping.
7 files changed, 15 insertions(+), 15 deletions(-)
  • +4 -4
    gplugin-gtk/meson.build
  • +6 -6
    gplugin/meson.build
  • +1 -1
    lua/meson.build
  • +1 -1
    perl/meson.build
  • +1 -1
    plugins/meson.build
  • +1 -1
    python/meson.build
  • +1 -1
    tcc/meson.build
    • --- a/gplugin-gtk/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/gplugin-gtk/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -55,14 +55,14 @@
    output : 'gplugin-gtk.h',
    configuration : conf,
    install : true,
    - install_dir : get_option('includedir') + '/gplugin-1.0')
    + install_dir : join_paths(get_option('includedir'), 'gplugin-1.0'))
    configure_file(
    input : 'gplugin-gtk.pc.in',
    output : 'gplugin-gtk.pc',
    configuration : version_conf,
    install : true,
    - install_dir : get_option('libdir') + '/pkgconfig')
    + install_dir : join_paths(get_option('libdir'), 'pkgconfig'))
    ###############################################################################
    # Library Target
    @@ -91,7 +91,7 @@
    # install the GtkBuilder files
    install_data(
    'gplugin-gtk-plugin-info.ui',
    - install_dir : get_option('datadir') + '/gplugin/gplugin-gtk/'
    + install_dir : join_paths(get_option('datadir'), 'gplugin', 'gplugin-gtk')
    )
    ###############################################################################
    @@ -113,7 +113,7 @@
    gplugin_gtk_viewer],
    output : 'gplugin-gtk-viewer.1',
    install : true,
    - install_dir : get_option('mandir') + '/man1')
    + install_dir : join_paths(get_option('mandir'), 'man1'))
    endif
    endif # gtk3
    --- a/gplugin/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/gplugin/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -77,7 +77,7 @@
    h_template : 'gplugin-enums.h.tmpl',
    identifier_prefix : 'GPlugin',
    install_header : true,
    - install_dir : get_option('includedir') + '/gplugin-1.0/gplugin')
    + install_dir : join_paths(get_option('includedir'), 'gplugin-1.0', 'gplugin'))
    enums_c = enums[0]
    enums_h = enums[1]
    @@ -119,7 +119,7 @@
    output : 'gplugin-version.h',
    configuration : version_conf,
    install : true,
    - install_dir : get_option('includedir') + '/gplugin-1.0/gplugin')
    + install_dir : join_paths(get_option('includedir'), 'gplugin-1.0', 'gplugin'))
    GPLUGIN_PUBLIC_BUILT_HEADERS += [
    gplugin_version_h
    ]
    @@ -129,7 +129,7 @@
    output : 'gplugin.pc',
    configuration : version_conf,
    install : true,
    - install_dir : get_option('libdir') + '/pkgconfig')
    + install_dir : join_paths(get_option('libdir'), 'pkgconfig'))
    configure_file(
    input : 'gplugin-uninstalled.pc.in',
    output : 'gplugin-uninstalled.pc',
    @@ -157,7 +157,7 @@
    output : 'gplugin.h',
    configuration : conf,
    install : true,
    - install_dir : get_option('includedir') + '/gplugin-1.0')
    + install_dir : join_paths(get_option('includedir'), 'gplugin-1.0'))
    # Build gplugin-native.h
    GPLUGIN_NATIVE_H_INCLUDES = ''
    @@ -174,7 +174,7 @@
    output : 'gplugin-native.h',
    configuration : conf,
    install : true,
    - install_dir : get_option('includedir') + '/gplugin-1.0')
    + install_dir : join_paths(get_option('includedir'), 'gplugin-1.0'))
    ###############################################################################
    # Library target
    @@ -233,7 +233,7 @@
    gplugin_query],
    output : 'gplugin-query.1',
    install : true,
    - install_dir : get_option('mandir') + '/man1')
    + install_dir : join_paths(get_option('mandir'), 'man1'))
    endif
    ###############################################################################
    --- a/lua/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/lua/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -45,7 +45,7 @@
    name_prefix : '',
    dependencies : [LUA, gplugin_dep],
    install : true,
    - install_dir : get_option('libdir') + '/gplugin'
    + install_dir : join_paths(get_option('libdir'), 'gplugin')
    )
    endif # lua
    --- a/perl/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/perl/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -32,6 +32,6 @@
    name_prefix : '',
    dependencies : [gplugin_dep],
    install : true,
    - install_dir : get_option('libdir') + '/gplugin'
    + install_dir : join_paths(get_option('libdir'), 'gplugin')
    )
    endif # perl
    --- a/plugins/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/plugins/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -3,4 +3,4 @@
    name_prefix : '',
    dependencies : [gplugin_dep],
    install : true,
    - install_dir : get_option('libdir') + '/gplugin')
    + install_dir : join_paths(get_option('libdir'), 'gplugin'))
    --- a/python/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/python/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -36,7 +36,7 @@
    name_prefix : '',
    dependencies : [PYTHON3, PYGOBJECT, gplugin_dep],
    install : true,
    - install_dir : get_option('libdir') + '/gplugin'
    + install_dir : join_paths(get_option('libdir'), 'gplugin')
    )
    gplugin_python_dep = declare_dependency(
    include_directories : gplugin_python_inc,
    --- a/tcc/meson.build Sun Dec 18 03:32:52 2016 -0500
    +++ b/tcc/meson.build Sun Dec 18 03:49:14 2016 -0500
    @@ -21,7 +21,7 @@
    name_prefix : '',
    dependencies : [TCC, gplugin_dep],
    install : true,
    - install_dir : get_option('libdir') + '/gplugin'
    + install_dir : join_paths(get_option('libdir'), 'gplugin')
    )
    endif # tcc