[glib: 3/3] Merge branch '1919-relative-paths' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit f0e7bc16abca263c530023503cb59622d1d3c51c
Merge: 8e0bd39b5 3529bb445
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Feb 17 19:46:54 2020 +0000

    Merge branch '1919-relative-paths' into 'master'
    
    build: Rework path construction to reliably add prefix
    
    Closes #1919
    
    See merge request GNOME/glib!1369

 gio/gdbus-2.0/codegen/meson.build |  2 +-
 gio/meson.build                   |  9 +++++----
 glib/gnulib/meson.build           |  2 +-
 glib/libcharset/localcharset.c    |  6 +-----
 glib/libcharset/meson.build       |  7 +------
 meson.build                       | 13 ++++++++++---
 6 files changed, 19 insertions(+), 20 deletions(-)
---