From: Roger Pau Monne Date: Tue, 25 Oct 2016 09:53:28 +0000 (+0200) Subject: tools/configure: fix pkg-config install path for FreeBSD X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~151 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4000a7c7d7b0e01837abd3918e393f289c07d68c;p=xen.git tools/configure: fix pkg-config install path for FreeBSD pkg-config from FreeBSD ports doesn't have ${prefix}/share/pkgconfig in the default search path, fix this by having a PKG_INSTALLDIR variable that can be changed on a per-OS basis. It would be best to use PKG_INSTALLDIR as defined by the pkg.m4 macro, but sadly this also reports a wrong value on FreeBSD (${libdir}/pkgconfig, which expands to /usr/local/lib/pkgconfig by default, and is also _not_ part of the default pkg-config search path). This patch should not change the behavior for Linux installs. Signed-off-by: Roger Pau Monné Reported-by: Alexander Nusov Acked-by: Wei Liu Release-acked-by: Wei Liu --- diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk index bb3a5d0beb..afeaefbde2 100644 --- a/config/FreeBSD.mk +++ b/config/FreeBSD.mk @@ -2,3 +2,4 @@ include $(XEN_ROOT)/config/StdGNU.mk # No wget on FreeBSD base system WGET = ftp +PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 62cea48a58..a603295146 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -56,3 +56,5 @@ XENFIRMWAREDIR := @XENFIRMWAREDIR@ XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ + +PKG_INSTALLDIR := ${SHAREDIR}/pkgconfig diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 79e40199ac..af0a3ad7cb 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -320,8 +320,8 @@ install: all $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh - $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ - $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ + $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(PKG_INSTALLDIR) + $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(PKG_INSTALLDIR) .PHONY: clean clean: