diff options
| author | NIIBE Yutaka <[email protected]> | 2018-10-17 03:33:05 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-10-17 03:33:05 +0000 |
| commit | d8cf57c35d4627fa28588d6ec385fcffbc5a01a0 (patch) | |
| tree | 028675f222fae2723a266832270076dd20296111 | |
| parent | gpg-error-config: Support PKG_CONFIG_LIBDIR. (diff) | |
| download | libgpg-error-d8cf57c35d4627fa28588d6ec385fcffbc5a01a0.tar.gz libgpg-error-d8cf57c35d4627fa28588d6ec385fcffbc5a01a0.zip | |
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 <[email protected]>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gpg-error-config-new.in | 4 |
2 files changed, 4 insertions, 2 deletions
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:-@libdir@} -PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}${libdir}/pkgconfig" +pkg_config_libdir=${PKG_CONFIG_LIBDIR:-@pkg_config_libdir@} +PKG_CONFIG_PATH="$PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:}$pkg_config_libdir" # #### start of functions for this script |