Don't use AM_FLAGS anymore (do we really still care about
automake versions that don't observe libname_CFLAGS?).

Use -hook target instead of -local to do post-installation
steps.

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

diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am 
b/usr/lib/pkcs11/aep_stdll/Makefile.am
index ea6e98b..98b4a2f 100644
--- a/usr/lib/pkcs11/aep_stdll/Makefile.am
+++ b/usr/lib/pkcs11/aep_stdll/Makefile.am
@@ -9,10 +9,6 @@ opencryptoki_stdll_libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV   
        \
 -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2   \
 -DNODSA -DDEBUGON -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\"
 
-# Not all versions of automake observe libname_CFLAGS
-AM_CFLAGS = @CFLAGS@ -DSPINXPL -DDEV -D_THREAD_SAFE -fPIC -DSHALLOW=0  \
--DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2 -DNODSA -DDEBUGON -DAEP_GENERIC -DNORIPE
-
 opencryptoki_stdll_libpkcs11_aep_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          \
@@ -29,6 +25,6 @@ aeptok_specific.c aeptok_api.c
 INCLUDES = -I/usr/include -I. -I../../../include/pkcs11/stdll  \
 -I../../../include/pkcs11 -I ../common
 
-install-data-local:
-       cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && rm -f PKCS11_AEP.so && \
+install-data-hook:
+       cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
                ln -sf libpkcs11_aep.so PKCS11_AEP.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