Don't use AM_FLAGS, add a post-installation step to create
a PKCS11_TPM.so softlink (like other stdlls do)

Signed-off-by: Klaus Heinrich Kiwi <[email protected]>
---
 usr/lib/pkcs11/tpm_stdll/Makefile.am |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/usr/lib/pkcs11/tpm_stdll/Makefile.am 
b/usr/lib/pkcs11/tpm_stdll/Makefile.am
index 18dc2f6..1718b08 100644
--- a/usr/lib/pkcs11/tpm_stdll/Makefile.am
+++ b/usr/lib/pkcs11/tpm_stdll/Makefile.am
@@ -16,11 +16,6 @@ opencryptoki_stdll_libpkcs11_tpm_la_CFLAGS = -DLINUX 
-DSPINXPL -DNOCDMF      \
                                             -I../common -DMMAP         \
                                             -DSTDLL_NAME=\"tpmtok\"
 
-# Not all versions of automake observe libname_CFLAGS
-AM_CFLAGS = -DLINUX -DMMAP -DSPINXPL -DNOCDMF -DNODSA -DNODH -I. \
-           -I../../../include -I../../../include/pkcs11 \
-           -I../common
-
 opencryptoki_stdll_libpkcs11_tpm_la_LDFLAGS = -shared -Wl,-Bsymbolic   \
                                              -lcrypto -ltspi -lpthread
 
@@ -58,3 +53,6 @@ opencryptoki_stdll_libpkcs11_tpm_la_SOURCES = 
../common/asn1.c           \
 noinst_HEADERS = h_extern.h tok_spec_struct.h defs.h   \
                 host_defs.h tpm_specific.h tok_specific.h
 
+install-data-hook:
+       cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
+               ln -sf libpkcs11_tpm.so PKCS11_TPM.so
-- 
1.6.2.5


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech

Reply via email to