Create a link for the proxy module.

 * Install proxy module at its own path which is not prefixed by 'lib'
 * Since the proxy module is the same as the library, and actually
   needs to be loaded as the same library in memory (due to resource
   tracking per process), use a symlink for proxy.
 * Add a variable to the pkg-config file which shows the path
   to the proxy module. ie:
   $ pkg-config --variable=proxy_module p11-kit-1

https://bugzilla.redhat.com/show_bug.cgi?id=725905

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 41644123e5710b24237399da47317fb6edaf5e16..c45efc16b7f7d3cabad0e4ab96acdb0902223e04 100644 (file)
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -45,4 +45,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = p11-kit-1.pc
 
 EXTRA_DIST = \
-       p11-kit-1.pc.in
\ No newline at end of file
+       p11-kit-1.pc.in
+
+# Proxy module is actually same as library, so install a link
+install-exec-hook:
+       $(LN_S) libp11-kit.so $(DESTDIR)$(libdir)/p11-kit-proxy.so
\ No newline at end of file

diff --git a/p11-kit/p11-kit-1.pc.in b/p11-kit/p11-kit-1.pc.in
index c5bcdbd00694dccd3fb3207f4f6a2129bbd3b1f2..9ef67a3e5467cc427c1a29ed9658f43c671fabf7 100644 (file)
--- a/p11-kit/p11-kit-1.pc.in
+++ b/p11-kit/p11-kit-1.pc.in
@@ -9,6 +9,7 @@ p11_system_conf=@p11_system_conf@
 p11_system_modules=@p11_system_modules@
 p11_user_conf=@p11_user_conf@
 p11_user_modules=@p11_user_modules@
+proxy_module=@libdir@/p11-kit-proxy.so
 
 Name: p11-kit
 Description: Library and proxy module for properly loading and sharing PKCS#11 modules.