[libgit2-glib] build: install ggit-enum-types into real includedir

[Igor Gnatenko <ignatenko src gnome org>]

commit f1a5e8531d96c747f676d0c10e23a3e2106b3a03
Author: Igor Gnatenko <ignatenko src gnome org>
Date:   Fri Feb 17 10:47:37 2017 +0100

    build: install ggit-enum-types into real includedir
    
    Signed-off-by: Igor Gnatenko <ignatenko src gnome org>

 libgit2-glib/meson.build |    6 +++---
 meson.build              |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index 407af00..f7f7f44 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -146,16 +146,16 @@ sources = [
 configure_file(input : 'ggit.h.in',
                output : 'ggit.h',
                configuration : ggit_h_data,
-               install_dir: join_paths(get_option('includedir'), 
'libgit2-glib-@0@'.format(libgit2_glib_api_version)))
+               install_dir: libgit2_glib_includedir_real)
 
 enum_types = gnome.mkenums('ggit-enum-types',
   sources : headers,
   h_template : 'ggit-enum-types.h.template',
   c_template : 'ggit-enum-types.c.template',
   install_header : true,
-  install_dir : get_option('includedir'))
+  install_dir: libgit2_glib_includedir_real)
 
-install_headers(headers, subdir: 'libgit2-glib-@0@'.format(libgit2_glib_api_version))
+install_headers(headers, subdir: libgit2_glib_includedir_real)
 
 pkgconfig_files = [ 'libgit2-glib-@0@'.format(libgit2_glib_api_version) ]
 platform_deps = [ glib, gobject, gio, libgit2 ]
diff --git a/meson.build b/meson.build
index aab7363..3c9a454 100644
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,9 @@ libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
 libgit2_glib_prefix = get_option('prefix')
 libgit2_glib_libdir = join_paths(libgit2_glib_prefix, get_option('libdir'))
 libgit2_glib_includedir = join_paths(libgit2_glib_prefix, get_option('includedir'))
+libgit2_glib_includedir_real = join_paths(libgit2_glib_includedir,
+                                          'libgit2-glib-@0@'.format(libgit2_glib_api_version),
+                                          'libgit2-glib')
 libgit2_glib_datadir = join_paths(libgit2_glib_prefix, get_option('datadir'))
 
 cc = meson.get_compiler('c')