[glib/glib-2-62: 3/3] Merge branch 'backport-1369-relative-paths-glib-2-62' into 'glib-2-62'

[Philip Withnall <pwithnall src gnome org>]

commit 6e8b8b0f8c53055c5381cfb927821c64be55bf26
Merge: 5fab0663c 88cb9fe51
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Feb 17 19:53:40 2020 +0000

    Merge branch 'backport-1369-relative-paths-glib-2-62' into 'glib-2-62'
    
    Backport !1369 “build: Rework path construction to reliably add prefix” to glib-2-62
    
    See merge request GNOME/glib!1370

 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(-)
---