* The loader cache configuration files in ld.so.conf.d must use an absolute
   path for the librarie

 * Use relative links for installing the API symlinks

Signed-off-by: Klaus Heinrich Kiwi <[email protected]>
---
 usr/lib/Makefile.am            |    4 ++--
 usr/lib/pkcs11/api/Makefile.am |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/lib/Makefile.am b/usr/lib/Makefile.am
index ac6a6b3..a76e7a9 100644
--- a/usr/lib/Makefile.am
+++ b/usr/lib/Makefile.am
@@ -2,9 +2,9 @@ SUBDIRS = pkcs11
 
 install-data-hook:
        $(MKDIR_P) $(DESTDIR)/etc/ld.so.conf.d
-       echo "$(DESTDIR)$(libdir)/opencryptoki" >\
+       echo "$(libdir)/opencryptoki" >\
                $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(host_cpu).conf
-       echo "$(DESTDIR)$(libdir)/opencryptoki/stdll" >>\
+       echo "$(libdir)/opencryptoki/stdll" >>\
                $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(host_cpu).conf
        echo "**** Remember you must run ldconfig before using the above 
settings ****"
 
diff --git a/usr/lib/pkcs11/api/Makefile.am b/usr/lib/pkcs11/api/Makefile.am
index 3f9562e..0bb0e51 100644
--- a/usr/lib/pkcs11/api/Makefile.am
+++ b/usr/lib/pkcs11/api/Makefile.am
@@ -18,14 +18,14 @@ install-data-hook:
        cd $(DESTDIR)$(libdir)/opencryptoki && \
                ln -sf libopencryptoki.so PKCS11_API.so 
        cd $(DESTDIR)$(libdir)/opencryptoki && \
-               ln -sf $(DESTDIR)$(sbindir) methods
+               ln -sf $(sbindir) methods
        $(MKDIR_P) $(DESTDIR)$(libdir)/pkcs11
        cd $(DESTDIR)$(libdir)/pkcs11 && \
-               ln -sf $(DESTDIR)$(sbindir) methods
+               ln -sf $(sbindir) methods
        cd $(DESTDIR)$(libdir)/pkcs11 && \
-               ln -sf $(DESTDIR)$(libdir)/opencryptoki/libopencryptoki.so 
PKCS11_API.so
-       cd $(DESTDIR)/$(libdir)/pkcs11 && \
-               ln -sf $(DESTDIR)$(libdir)/opencryptoki/libopencryptoki.so 
libopencryptoki.so
-       $(MKDIR_P) $(DESTDIR)/$(libdir)/opencryptoki/stdll
-       cd $(DESTDIR)/$(libdir)/pkcs11 && \
-               ln -sf $(DESTDIR)$(libdir)/opencryptoki/stdll/ stdll
+               ln -sf ../opencryptoki/libopencryptoki.so PKCS11_API.so
+       cd $(DESTDIR)$(libdir)/pkcs11 && \
+               ln -sf ../opencryptoki/libopencryptoki.so libopencryptoki.so
+       $(MKDIR_P) $(DESTDIR)$(libdir)/opencryptoki/stdll
+       cd $(DESTDIR)$(libdir)/pkcs11 && \
+               ln -sf ../opencryptoki/stdll/ stdll
-- 
1.7.1.1


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech

Reply via email to