Don't use AM_FLAGS, use -hook instead of -local
in install targets.
Signed-off-by: Klaus Heinrich Kiwi <[email protected]>
---
usr/lib/pkcs11/cr_stdll/Makefile.am | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/usr/lib/pkcs11/cr_stdll/Makefile.am
b/usr/lib/pkcs11/cr_stdll/Makefile.am
index 33c8f0b..2ee7a20 100644
--- a/usr/lib/pkcs11/cr_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cr_stdll/Makefile.am
@@ -10,10 +10,6 @@ VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
opencryptoki_stdll_libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DDEBUGON
-# Not all versions of automake observe libname_CFLAGS
-AM_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF \
--DNOMD2 -DNODSA -DDEBUGON -DSTDLL_NAME=\"crtok\"
-
opencryptoki_stdll_libpkcs11_cr_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
@@ -32,6 +28,6 @@ INCLUDES = $(CR_INC_DIRS) -I/usr/include
\
-I../common -I../../../ica/inc -I../../../../ica/include \
-I.. -I../../../../ica/src/inc
-install-data-local:
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && rm -f PKCS11_CR.so && \
+install-data-hook:
+ cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
ln -sf libpkcs11_cr.so PKCS11_CR.so
--
1.6.2.5
------------------------------------------------------------------------------
Come build with us! The BlackBerry® 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-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
