[libgit2-glib] meson: Replace the package include dir path

[Alberto Fanjul <albfan src gnome org>]

commit ca843d0cd49930c047400dae6a4a0709109d9844
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed May 22 09:12:10 2019 +0200

    meson: Replace the package include dir path
    
    The package include dir path (aka `libgit2_glib_pkgincludedir`) has
    replace by the use of the `includedir` option path and the expected
    subdir path. This way the use of the include subdir is more clearly
    related.

 libgit2-glib/meson.build | 6 +++---
 meson.build              | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index 27fdb4c..dc893a1 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -181,19 +181,19 @@ sources += configure_file(
   input: ggit_h + '.in',
   output: ggit_h,
   configuration: ggit_h_conf,
-  install_dir: libgit2_glib_pkgincludedir,
+  install_dir: libgit2_glib_includedir / libgit2_glib_include_subdir,
 )
 
 enum_sources = gnome.mkenums_simple(
   'ggit-enum-types',
   sources: headers,
   install_header: true,
-  install_dir: libgit2_glib_pkgincludedir,
+  install_dir: libgit2_glib_includedir / libgit2_glib_include_subdir,
 )
 
 install_headers(
   headers,
-  subdir: libgit2_glib_api_name / meson.project_name(),
+  subdir: libgit2_glib_include_subdir,
 )
 
 platform_deps = [
diff --git a/meson.build b/meson.build
index 0fcd55d..2a7187f 100644
--- a/meson.build
+++ b/meson.build
@@ -40,8 +40,9 @@ darwin_versions = [current + 1, '@0@.@1@'.format(current + 1, revision)]
 libgit2_glib_prefix = get_option('prefix')
 libgit2_glib_libdir = get_option('libdir')
 libgit2_glib_datadir = get_option('datadir')
+libgit2_glib_includedir = get_option('includedir')
 
-libgit2_glib_pkgincludedir = get_option('includedir') / libgit2_glib_api_name / meson.project_name()
+libgit2_glib_include_subdir = libgit2_glib_api_name / meson.project_name()
 
 gnome = import('gnome')
 pkg = import('pkgconfig')