From e5702aa662fda5761d2f91520d9977c28d0a170b Mon Sep 17 00:00:00 2001
From: Stephan Lachnit <stephanlachnit@debian.org>
Date: Thu, 17 Oct 2024 15:56:13 +0200
Subject: [PATCH] meson: install header and pkg-config file and in subprojects

---
 include/meson.build | 18 +++++++-----------
 src/meson.build     | 16 +++++++---------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index 206dc6f5..b5387b29 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -5,22 +5,18 @@
 
 include_dir = include_directories('.')
 
-if not is_subproject
-	install_subdir('toml++', install_dir: get_option('includedir'))
-endif
+install_subdir('toml++', install_dir: get_option('includedir'))
 
 if not build_lib # header-only mode
 
 	tomlplusplus_dep = declare_dependency(include_directories: include_dir)
 
-	if not is_subproject
-		import('pkgconfig').generate(
-			name: meson.project_name(),
-			description: 'Header-only TOML config file parser and serializer for C++',
-			install_dir: get_option('datadir')/'pkgconfig',
-			url: 'https://marzer.github.io/tomlplusplus'
-		)
-	endif
+	import('pkgconfig').generate(
+		name: meson.project_name(),
+		description: 'Header-only TOML config file parser and serializer for C++',
+		install_dir: get_option('datadir')/'pkgconfig',
+		url: 'https://marzer.github.io/tomlplusplus'
+	)
 
 	# cmake
 	if get_option('generate_cmake_config') and not is_subproject and not is_devel
diff --git a/src/meson.build b/src/meson.build
index 3b3b5372..f430ab12 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -32,7 +32,7 @@ tomlplusplus_lib = library(
 	cpp_args: lib_internal_args,
 	gnu_symbol_visibility: get_option('default_library') == 'static' ? '' : 'hidden',
 	include_directories: include_dir,
-	install: not is_subproject,
+	install: true,
 	version: meson.project_version(),
 	override_options: global_overrides
 )
@@ -43,14 +43,12 @@ tomlplusplus_dep = declare_dependency(
 	link_with: tomlplusplus_lib
 )
 
-if not is_subproject
-	import('pkgconfig').generate(
-		tomlplusplus_lib,
-		description: 'TOML config file parser and serializer for C++',
-		extra_cflags: lib_args,
-		url: 'https://marzer.github.io/tomlplusplus'
-	)
-endif
+import('pkgconfig').generate(
+	tomlplusplus_lib,
+	description: 'TOML config file parser and serializer for C++',
+	extra_cflags: lib_args,
+	url: 'https://marzer.github.io/tomlplusplus'
+)
 
 # cmake
 if get_option('generate_cmake_config') and not is_subproject and not is_devel