meson: Set install_tag on remaining installed files

7 files changed, 38 insertions, 14 deletions

diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index f0a256898..16abd97d6 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -32,6 +32,7 @@ gdbus_codegen_built_files = []
 gdbus_codegen_built_files += configure_file(input : 'config.py.in',
                                             output : 'config.py',
                                             install_dir : codegen_dir,
+                                            install_tag : 'bin-devel',
                                             configuration : gdbus_codegen_conf)
 
 foreach f : gdbus_codegen_files
@@ -39,5 +40,6 @@ foreach f : gdbus_codegen_files
   # and then install it too so that it can be used after installation
   gdbus_codegen_built_files += configure_file(input : f, output : f,
                                               install_dir : codegen_dir,
+                                              install_tag : 'bin-devel',
                                               copy : true)
 endforeach
diff --git a/gio/meson.build b/gio/meson.build
index fdd2528df..14f0d8259 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -800,13 +800,15 @@ if have_bash
   endif
 
   install_data([
-    'completion/gapplication',
-    'completion/gdbus',
-    'completion/gio',
-    'completion/gsettings',
-    'completion/gresource'
-  ],
-  install_dir: bash_comp_inst_dir)
+      'completion/gapplication',
+      'completion/gdbus',
+      'completion/gio',
+      'completion/gsettings',
+      'completion/gresource'
+    ],
+    install_dir: bash_comp_inst_dir,
+    install_tag: 'bin',
+  )
 endif
 
 if enable_dtrace
@@ -1017,10 +1019,14 @@ executable('gsettings', 'gsettings-tool.c',
   link_args : noseh_link_args,
   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
 install_data('gschema.dtd',
-  install_dir : join_paths(get_option('datadir'), schemas_subdir))
+  install_dir : get_option('datadir') / schemas_subdir,
+  install_tag : 'devel',
+)
 
 install_data(['gschema.loc', 'gschema.its'],
-  install_dir : join_paths(get_option('datadir'), 'gettext/its'))
+  install_dir : get_option('datadir') / 'gettext' / 'its',
+  install_tag : 'devel',
+)
 
 executable('gdbus', 'gdbus-tool.c',
   install : true,
diff --git a/glib/meson.build b/glib/meson.build
index 503948766..c365901a1 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -1,5 +1,6 @@
 glibconfig_h = configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
   install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
+  install_tag : 'devel',
   configuration : glibconfig_conf)
 
 subdir('libcharset')
@@ -453,7 +454,10 @@ configure_file(
   install_mode: 'rwxr-xr-x'
 )
 
-install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
+install_data('glib_gdb.py',
+  install_dir : glib_pkgdatadir / 'gdb',
+  install_tag : 'devel',
+)
 
 # This is needed to make gdb find glib_gdb.py
 env = environment()
@@ -480,6 +484,7 @@ configure_file(
   output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version),
   configuration: gdb_conf,
   install_dir: gdb_install_dir,
+  install_tag: 'devel',
   install: gdb_install,
 )
 
diff --git a/gobject/meson.build b/gobject/meson.build
index c12ff6d7d..bc44d5db1 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -158,7 +158,10 @@ executable('gobject-query', 'gobject-query.c',
   install_tag : 'bin-devel',
   dependencies : [libglib_dep, libgobject_dep])
 
-install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
+install_data('gobject_gdb.py',
+  install_dir : glib_pkgdatadir / 'gdb',
+  install_tag : 'devel',
+)
 gdb_conf = configuration_data()
 gdb_conf.set('datadir', glib_datadir)
 configure_file(
@@ -166,6 +169,7 @@ configure_file(
   output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version),
   configuration: gdb_conf,
   install_dir: gdb_install_dir,
+  install_tag: 'devel',
   install: gdb_install,
 )
 
diff --git a/meson.build b/meson.build
index 4885de994..3a81ec5ca 100644
--- a/meson.build
+++ b/meson.build
@@ -2391,7 +2391,9 @@ endif
 
 # Install m4 macros that other projects use
 install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4',
-  install_dir : join_paths(get_option('datadir'), 'aclocal'))
+  install_dir : get_option('datadir') / 'aclocal',
+  install_tag : 'devel',
+)
 
 configure_file(output : 'config.h', configuration : glib_conf)
 
diff --git a/po/meson.build b/po/meson.build
index 9fab01864..489d12754 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -2,4 +2,7 @@ i18n = import('i18n')
 
 i18n.gettext('glib20', preset: 'glib')
 
-install_data('Makefile.in.in', install_dir : glib_pkgdatadir + '/gettext/po')
+install_data('Makefile.in.in',
+  install_dir : glib_pkgdatadir / 'gettext' / 'po',
+  install_tag : 'devel',
+)
diff --git a/tools/meson.build b/tools/meson.build
index 0542fb89b..e91c8a2f9 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -18,5 +18,7 @@ if host_system != 'windows'
   # Install Valgrind suppression file (except on Windows,
   # as Valgrind is currently not supported on Windows)
   install_data('glib.supp',
-    install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'valgrind'))
+    install_dir : get_option('datadir') / 'glib-2.0' / 'valgrind',
+    install_tag : 'devel',
+  )
 endif