meson: install pkgconfig files

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index d538d037eb034237da058193304382c244ef9f9b..e6a37deb4a53f51c5ad6070f1ad0bbfd5c640e28 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,6 @@ SUBDIRS = .
 XZ_OPT ?= -v -T0
 export XZ_OPT
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc
-
 rpm: clean
        @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz)
 

diff --git a/configure.ac b/configure.ac
index ff0391bf2468491341bf1ab77b8ffcec83087127..b1a7ceff6e41f8341f23b95f25ba6fc3ce551bc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -109,9 +109,5 @@ AC_CONFIG_FILES([\
         Makefile \
         .color_coded \
         .ycm_extra_conf.py \
-        libvirt.pc \
-        libvirt-qemu.pc \
-        libvirt-lxc.pc \
-        libvirt-admin.pc \
         libvirt.spec mingw-libvirt.spec])
 AC_OUTPUT

diff --git a/meson.build b/meson.build
index 5b9b45a5dc7802c0ac2029d0ed0f28cd90eb8cbf..2f2868f7750d2a9190cabc97d83ad8655cc98e3c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2234,6 +2234,35 @@ subdir('po')
 subdir('docs')
 
 
+# install pkgconfig files
+pkgconfig_files = [
+  'libvirt.pc.in',
+  'libvirt-qemu.pc.in',
+  'libvirt-lxc.pc.in',
+  'libvirt-admin.pc.in',
+]
+
+pkgconfig_conf = configuration_data()
+pkgconfig_conf.set('VERSION', meson.project_version())
+pkgconfig_conf.set('datadir', datadir)
+pkgconfig_conf.set('datarootdir', datadir)
+pkgconfig_conf.set('exec_prefix', prefix)
+pkgconfig_conf.set('includedir', includedir)
+pkgconfig_conf.set('libdir', libdir)
+pkgconfig_conf.set('prefix', prefix)
+
+pkgconfig_dir = libdir / 'pkgconfig'
+
+foreach file : pkgconfig_files
+  configure_file(
+    input: file,
+    output: '@BASENAME@',
+    configuration: pkgconfig_conf,
+    install: true,
+    install_dir: pkgconfig_dir,
+  )
+endforeach
+
 # generate meson-config.h file
 configure_file(output: 'meson-config.h', configuration: conf)