Don't use AM_FLAGS, use -hook instead of -local in install targets. In addition use pkgdata_DATA primary to install README.cca_stdll and README-IBM_CCA_users
Signed-off-by: Klaus Heinrich Kiwi <[email protected]> --- usr/lib/pkcs11/cca_stdll/Makefile.am | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/usr/lib/pkcs11/cca_stdll/Makefile.am b/usr/lib/pkcs11/cca_stdll/Makefile.am index 0e5236c..6604e01 100644 --- a/usr/lib/pkcs11/cca_stdll/Makefile.am +++ b/usr/lib/pkcs11/cca_stdll/Makefile.am @@ -6,14 +6,10 @@ # nobase_lib_LTLIBRARIES=opencryptoki/stdll/libpkcs11_cca.la -# Not all versions of automake observe libname_CFLAGS -opencryptoki_stdll_libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \ - -DNODSA -DNODH -DNOECB \ - -I. -I../../../include -I../../../include/pkcs11 -I../common \ - -DSTDLL_NAME=\"ccatok\" +pkgdata_DATA=README.cca_stdll README-IBM_CCA_users # Not all versions of automake observe libname_CFLAGS -AM_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF -DNODSA -DNODH -DNOECB \ +opencryptoki_stdll_libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \ -DNODSA -DNODH -DNOECB \ -I. -I../../../include -I../../../include/pkcs11 -I../common \ -DSTDLL_NAME=\"ccatok\" @@ -57,7 +53,6 @@ opencryptoki_stdll_libpkcs11_cca_la_SOURCES = asn1.c \ noinst_HEADERS = h_extern.h tok_spec_struct.h defs.h csulincl.h \ host_defs.h cca_stdll.h tok_specific.h -install-data-local: - mkdir -p -- "$(DESTDIR)/$(datadir)/opencryptoki" - @INSTALL@ README-IBM_CCA_users $(DESTDIR)/$(datadir)/opencryptoki - +install-data-hook: + cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \ + ln -sf libpkcs11_cca.so PKCS11_CCA.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
