[gobject-introspection: 4/4] Merge branch 'master' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 65f7051bda63ec2ad50a42334b95ea22790f7eec
Merge: 54e12c01 3fe995a0
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Oct 9 07:02:33 2018 +0000

    Merge branch 'master' into 'master'
    
    Add option to make .gir files installation paths configurable
    
    See merge request GNOME/gobject-introspection!63

 .flake8                                   |  2 +-
 Makefile-tools.am                         |  2 +-
 configure.ac                              |  7 +++++--
 gir/meson.build                           |  1 -
 giscanner/transformer.py                  |  1 +
 gobject-introspection-1.0.pc.in           |  2 +-
 gobject-introspection-no-export-1.0.pc.in |  2 +-
 meson.build                               |  8 +++++++-
 meson_options.txt                         |  4 ++++
 tests/warn/warningtester.py               |  1 +
 tools/g-ir-tool-template.in               | 10 ++++++++++
 tools/meson.build                         |  1 +
 12 files changed, 33 insertions(+), 8 deletions(-)
---