From c91d14e20554fd98719609f65828de957b86f2a0 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 28 Nov 2020 15:19:41 +0100
Subject: [PATCH 1/4] meson: install headers into pkgconf/libpkgconf instead of
 just libpkgconf

To mirror what the autotools build does
---
 libpkgconf/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libpkgconf/meson.build b/libpkgconf/meson.build
index 64db65a..5c393b0 100644
--- a/libpkgconf/meson.build
+++ b/libpkgconf/meson.build
@@ -8,5 +8,5 @@ install_headers('libpkgconf.h',
   'iter.h',
   'bsdstubs.h',
   'libpkgconf-api.h',
-  subdir : 'libpkgconf')
+  subdir : 'pkgconf/libpkgconf')
 
-- 
2.41.0


From dee5775566560294e5a612a0f8586c425044eb6f Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 28 Nov 2020 15:20:25 +0100
Subject: [PATCH 2/4] meson: generate a .pc file for libpkgconf

---
 meson.build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meson.build b/meson.build
index bf5904f..d1b68d5 100644
--- a/meson.build
+++ b/meson.build
@@ -66,6 +66,14 @@ libpkgconf = shared_library('pkgconf',
   soversion : '3',
 )
 
+pkg = import('pkgconfig')
+pkg.generate(libpkgconf,
+  name : 'libpkgconf',
+  description : 'a library for accessing and manipulating development framework configuration',
+  url: 'http://github.com/pkgconf/pkgconf',
+  filebase : 'libpkgconf',
+  subdirs: ['pkgconf'],
+)
 
 pkgconf_exe = executable('pkgconf',
   'cli/main.c',
-- 
2.41.0


From b0af61d15aaa51978699d0ba835d213f2cab10fd Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 28 Nov 2020 15:21:02 +0100
Subject: [PATCH 3/4] meson: allow building a static version of libpkgconf

when using library() instead of shared_library() the user can decide
to build a shared or static version, or both. The default is still shared
as before.

This mirrors what the autotools based build sysstem can do.
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index d1b68d5..4916ccd 100644
--- a/meson.build
+++ b/meson.build
@@ -45,7 +45,7 @@ cdata.set('abs_top_builddir', meson.build_root())
 
 subdir('libpkgconf')
 
-libpkgconf = shared_library('pkgconf',
+libpkgconf = library('pkgconf',
   'libpkgconf/argvsplit.c',
   'libpkgconf/audit.c',
   'libpkgconf/bsdstubs.c',
-- 
2.41.0


From 80e8550056e6392154c445329e02e73f82d92377 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 28 Nov 2020 15:22:28 +0100
Subject: [PATCH 4/4] meson: install README.md/AUTHORS to share/doc/pkgconf

To mirror what the autotools build does.
---
 meson.build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meson.build b/meson.build
index 4916ccd..d5697e0 100644
--- a/meson.build
+++ b/meson.build
@@ -97,3 +97,5 @@ install_man('man/pkg.m4.7')
 install_man('man/pc.5')
 install_man('man/pkgconf-personality.5')
 install_data('pkg.m4', install_dir: 'share/aclocal')
+install_data('AUTHORS', install_dir: 'share/doc/pkgconf')
+install_data('README.md', install_dir: 'share/doc/pkgconf')
\ No newline at end of file
-- 
2.41.0