[Xcb-commit] xcb/proto: 3 commits - configure.ac Makefile.am xcb-proto.pc.in

[GitLab Mirror]

 Makefile.am     |    2 +-
 configure.ac    |    3 ++-
 xcb-proto.pc.in |    1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e96f3b736a9859db9677b1b63b4b18379afc9ead
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jun 17 09:43:47 2022 -0400

    Call AC_OUTPUT without arguments
    
    configure.ac:22: warning: AC_OUTPUT should be used without arguments.
    configure.ac:22: You should run autoupdate.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 260876c..068eb83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,4 +19,5 @@ AM_PATH_PYTHON([2.5])
 xcbincludedir='${datadir}/xcb'
 AC_SUBST(xcbincludedir)
 
-AC_OUTPUT([Makefile src/Makefile xcbgen/Makefile xcb-proto.pc])
+AC_CONFIG_FILES([Makefile src/Makefile xcbgen/Makefile xcb-proto.pc])
+AC_OUTPUT
commit d849b9534a52b0199f26c1dd30ac11aba12db9dc
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jun 17 09:41:14 2022 -0400

    Install xcb-proto to $(datarootdir)
    
    ... i.e. to /usr/share/pkgconfig.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 0312e7a..8b57a83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = src xcbgen
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datarootdir)/pkgconfig
 pkgconfig_DATA = xcb-proto.pc
 
 EXTRA_DIST=doc xcb-proto.pc.in autogen.sh README.md
commit 32c0ac61ec18ded25053e5ac87e45ce8634e1f37
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jun 17 09:38:21 2022 -0400

    Remove libdir from xcb-proto.pc
    
    Added by 17ab095 ("add libdir/exec_prefix to xcb-xproto.pc") with the
    rationale of using it to find the python path, but later commits bd7a481
    ("pkg-config: Add sysroot prefix") and be9c255 ("Adjust to automake
    1.16.4 changes") make this directly accessible.
    
    By removing libdir from the pkgconfig file, the file becomes identical
    for different ABIs.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in
index c7c8b47..0822b18 100644
--- a/xcb-proto.pc.in
+++ b/xcb-proto.pc.in
@@ -2,7 +2,6 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
-libdir=@libdir@
 xcbincludedir=${pc_sysrootdir}@xcbincludedir@
 PYTHON_PREFIX=@PYTHON_PREFIX@
 pythondir=${pc_sysrootdir}@pythondir@