From 24cbacfe7a7bcf4f0c9233a0eb189b52fa114a3c Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 9 Dec 2019 09:02:56 -0500 Subject: [PATCH] Fix src/ pkg-config API XML paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The .pc files in src/ are intended for use with the ./run script, to ease building bindings against an uninstalled libvirt build. The pointer to the API XML files is incorrect though, it needs to point into the build tree. This fixes use of the run script for building libvirt-python, ex: /path/to/libvirt.git/run ./setup.py build Reviewed-by: Daniel P. Berrangé Signed-off-by: Cole Robinson --- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/libvirt.pc.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index 27e3de4244..9243bcf903 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -9,7 +9,7 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml +libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@ diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index 3eb9ad4bc1..a4f9e65c03 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -9,7 +9,7 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml +libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml Name: libvirt Version: @VERSION@ diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index 6ff1ce6272..a16e455210 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -9,12 +9,12 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_api=@datadir@/docs/libvirt-api.xml +libvirt_api=@abs_top_builddir@/docs/libvirt-api.xml # For compat with older versions - also present # in libvirt-qemu.pc / libvirt-lxc.pc -libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml -libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml +libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml +libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@