From 9f71b28dcb38e1d5d9001692e2f64009396aaf9b Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 10 Oct 2018 10:32:18 +0900 Subject: 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 Signed-off-by: NIIBE Yutaka --- src/Makefile.am | 2 +- src/gpg-error-config-new.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 -- cgit v1.2.3