[glibmm/glibmm-2-62] Meson build: Install generate_extra_defs.h

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 77c13ecf4915a323eec69e40c192bf3df3461510
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Thu Mar 19 12:39:06 2020 +0100

    Meson build: Install generate_extra_defs.h
    
    Fixes #70

 meson.build                      | 2 +-
 tools/extra_defs_gen/meson.build | 6 ++++--
 tools/meson.build                | 9 +++------
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0fa3f4cd..571d46cb 100644
--- a/meson.build
+++ b/meson.build
@@ -250,7 +250,7 @@ summary = [
   '                  libdir: @0@'.format(install_prefix / install_libdir),
   '         glibmmconfigdir: @0@'.format(install_prefix / install_glibmmconfigdir),
   '          giommconfigdir: @0@'.format(install_prefix / install_giommconfigdir),
-  '                   m4dir: @0@'.format(install_prefix / install_m4dir),
+  '              gmmprocdir: @0@'.format(install_prefix / install_procdir),
   '            pkgconfigdir: @0@'.format(install_prefix / install_pkgconfigdir),
   '                 datadir: @0@'.format(install_prefix / install_datadir),
   '                  docdir: @0@'.format(install_prefix / install_docdir),
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index 900943c9..65b56e96 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/meson.build
@@ -1,7 +1,7 @@
 # tools/extra_defs_gen
 
-# Input: is_msvc, glibmm_build_dep, giomm_build_dep, glibmm_api_version,
-#        glibmm_libversion
+# Input: glibmm_build_dep, giomm_build_dep, glibmm_api_version,
+#        glibmm_libversion, glibmm_pcname
 # Output: -
 
 glibmm_generate_extra_defs_library = library(
@@ -13,6 +13,8 @@ glibmm_generate_extra_defs_library = library(
   install: true,
 )
 
+install_headers('generate_extra_defs.h', subdir: glibmm_pcname / 'glibmm_generate_extra_defs')
+
 executable('generate_defs_glib', 'generate_defs_glib.cc',
   dependencies: glibmm_build_dep,
   link_with: glibmm_generate_extra_defs_library,
diff --git a/tools/meson.build b/tools/meson.build
index 0bc35106..ed7443dd 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,8 +1,7 @@
 # tools
 
 # Input: perl, m4, install_prefix, install_libdir, glibmm_pcname
-# Output: m4_files, install_m4dir, pm_files, install_pmdir, gmmproc,
-#         generate_wrap_init_pl
+# Output: install_procdir, m4_files, pm_files, gmmproc, generate_wrap_init_pl
 
 subdir('extra_defs_gen')
 
@@ -76,8 +75,7 @@ foreach file : m4_basefiles
   m4_files += 'm4' / file
 endforeach
 m4_files = files(m4_files)
-install_m4dir = install_procdir / 'm4'
-install_data(m4_files, install_dir: install_m4dir)
+install_data(m4_files, install_dir: install_procdir / 'm4')
 
 # Install pm files for reuse by other *mm projects, when building from git.
 pm_basefiles = [
@@ -97,5 +95,4 @@ foreach file : pm_basefiles
   pm_files += 'pm' / file
 endforeach
 pm_files = files(pm_files)
-install_pmdir = install_procdir / 'pm'
-install_data(pm_files, install_dir: install_pmdir)
+install_data(pm_files, install_dir: install_procdir / 'pm')