From 4454fc36a0dd9b6e99e302769084b2964eef34c1 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 27 Jul 2011 12:02:25 +0200 Subject: 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 --- p11-kit/Makefile.am | 6 +++++- p11-kit/p11-kit-1.pc.in | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'p11-kit') diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index 4164412..c45efc1 100644 --- 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 c5bcdbd..9ef67a3 100644 --- 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. -- cgit v1.1