[Xcb-commit] xcb/proto: xcb-proto.pc.in

[GitLab Mirror]

 xcb-proto.pc.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd7a481a3bee9283277badda95730f52185127bc
Author: Daniel Stone <daniels at collabora.com>
Date:   Wed Sep 27 18:16:22 2017 +0100

    pkg-config: Add sysroot prefix
    
    xcb-proto's pkg-config file exports static file paths for where to find
    its Python files and the XML definitions.
    
    When used to discover cflags, library paths, etc, pkg-config will
    prepend ${PKG_CONFIG_SYSROOT_DIR}, if any, to those paths. This makes
    the use of a sysroot prefix transparent to users. However, since it
    doesn't know about paths in custom variables, it cannot automatically
    prefix this.
    
    Adding ${pc_sysrootdir} to these absolute paths makes the behaviour
    match, and XCB builds work out of the box in a sysroot.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in
index d312e6e..a35f0bd 100644
--- a/xcb-proto.pc.in
+++ b/xcb-proto.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
 libdir=@libdir@
-xcbincludedir=@xcbincludedir@
-pythondir=@pythondir@
+xcbincludedir=${pc_sysrootdir}@xcbincludedir@
+pythondir=${pc_sysrootdir}@pythondir@
 
 Name: XCB Proto
 Description: X protocol descriptions for XCB