[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-22-g9f71b28

by NIIBE Yutaka cvs at cvs.gnupg.org
Wed Oct 10 03:38:23 CEST 2018


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  9f71b28dcb38e1d5d9001692e2f64009396aaf9b (commit)
      from  6167f3c461a4e53ccc5af620cdbfa28bfa9234f5 (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 9f71b28dcb38e1d5d9001692e2f64009396aaf9b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Oct 10 10:32:18 2018 +0900

    gpg-error-config: Fix the place of *.pc (for multilib).
    
    * src/Makefile.am (pkgconfigdir): It should be under libdir.
    * src/gpg-error-config-new.in: Likewise.
    
    --
    
    Reported-by: Alon Bar-Lev <alon.barlev at gmail.com>
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index c74baae..03e0b68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,7 @@ nodist_bin_SCRIPTS = gpgrt-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gpg-error.m4 gpgrt.m4
 
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gpg-error.pc
 
 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
diff --git a/src/gpg-error-config-new.in b/src/gpg-error-config-new.in
index 8bf92cf..e16e753 100644
--- a/src/gpg-error-config-new.in
+++ b/src/gpg-error-config-new.in
@@ -11,9 +11,9 @@
 # SPDX-License-Identifier: FSFULLR
 
 prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}${datadir}/pkgconfig"
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}${libdir}/pkgconfig"
 #
 
 #### start of functions for this script

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

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


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




More information about the Gnupg-commits mailing list