Skip to content

Commit

Permalink
Make the proxy_module extension in pkg-config .pc file adaptable
Browse files Browse the repository at this point in the history
Signed-off-by: Zoltan Fridrich <[email protected]>
  • Loading branch information
ZoltanFridrich committed Jun 10, 2023
1 parent 51ea284 commit cb531a6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,9 @@ AC_SUBST(SHLEXT)

AC_DEFINE_UNQUOTED(EXEEXT, ["$EXEEXT"], [File extension for executables])

p11_shlext=$SHLEXT
AC_SUBST(p11_shlext)

privatedir='${libexecdir}/p11-kit'
AC_SUBST(privatedir)

Expand Down
2 changes: 1 addition & 1 deletion p11-kit/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ endif
p11_kit_pc_variables = [
'p11_module_configs=@0@'.format(prefix / p11_package_config_modules),
'p11_module_path=@0@'.format(prefix / p11_module_path),
'proxy_module=@0@/p11-kit-proxy.so'.format(prefix / libdir),
'proxy_module=@0@/p11-kit-proxy@1@'.format(prefix / libdir, shlext),
# This is for compatibility. Other packages were using this to determine
# the directory they should install their module configs to, so override
# this and redirect them to the new location
Expand Down
2 changes: 1 addition & 1 deletion p11-kit/p11-kit-1.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sysconfdir=@sysconfdir@
p11_module_configs=@p11_package_config_modules@
p11_module_path=@p11_module_path@
p11_trust_paths=@with_trust_paths@
proxy_module=@libdir@/p11-kit-proxy.so
proxy_module=@libdir@/p11-kit-proxy@p11_shlext@

# This is for compatibility. Other packages were using this to determine
# the directory they should install their module configs to, so override
Expand Down

0 comments on commit cb531a6

Please sign in to comment.