[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-25-gd8cf57c

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  d8cf57c35d4627fa28588d6ec385fcffbc5a01a0 (commit)
      from  e9566da20cf9428e3094cbd63277ea2179459232 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d8cf57c35d4627fa28588d6ec385fcffbc5a01a0
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Oct 17 12:33:05 2018 +0900

    gpg-error-config: Fix PKG_CONFIG_LIBDIR support.
    
    * configure.ac (pkg_config_libdir): New.
    * src/gpg-error-config-new.in: Use pkg_config_libdir.
    
    --
    
    PKG_CONFIG_LIBDIR is not mere libdir but should include
    'pkgconfig'.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index 8389b67..f6078ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,6 +651,8 @@ AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],
                      build_tests=$enableval, build_tests=yes)
 AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != xno])
 
+pkg_config_libdir=$libdir/pkgconfig
+AC_SUBST(pkg_config_libdir)
 #
 # Substitution
 #
diff --git a/src/gpg-error-config-new.in b/src/gpg-error-config-new.in
index a7c1b78..442b95a 100644
--- a/src/gpg-error-config-new.in
+++ b/src/gpg-error-config-new.in
@@ -12,8 +12,8 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=${PKG_CONFIG_LIBDIR:- at libdir@}
-PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}${libdir}/pkgconfig"
+pkg_config_libdir=${PKG_CONFIG_LIBDIR:- at pkg_config_libdir@}
+PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}$pkg_config_libdir"
 #
 
 #### start of functions for this script

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                | 2 ++
 src/gpg-error-config-new.in | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org