Don't use AM_FLAGS, use -hook instead of -local in install targets, avoid redefining the libdir variable by using the nobase_ prefix (like every other stdll is doing)
Signed-off-by: Klaus Heinrich Kiwi <[email protected]> --- usr/lib/pkcs11/leeds_stdll/Makefile.am | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/usr/lib/pkcs11/leeds_stdll/Makefile.am b/usr/lib/pkcs11/leeds_stdll/Makefile.am index 1550317..e4b990c 100644 --- a/usr/lib/pkcs11/leeds_stdll/Makefile.am +++ b/usr/lib/pkcs11/leeds_stdll/Makefile.am @@ -1,21 +1,16 @@ -lib_LTLIBRARIES=libpkcs11_4758.la -libdir = $(exec_prefix)/lib/opencryptoki/stdll +nobase_lib_LTLIBRARIES=opencryptoki/stdll/libpkcs11_4758.la -libpkcs11_4758_la_LDFLAGS = $(SCC_LIB_DIRS) -nostartfiles -shared \ - -Wl,-Bsymbolic -Wl,-soname,[email protected] -lpthread -lscc \ - -ldl +opencryptoki_stdll_libpkcs11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles -shared \ + -Wl,-Bsymbolic -Wl,-soname,[email protected] -lpthread -lscc -ldl # Not all versions of automake observe libname_CFLAGS -libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD +opencryptoki_stdll_libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD -# Not all versions of automake observe libname_CFLAGS -AM_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD - -libpkcs11_4758_la_SOURCES = host_api.c util.c +opencryptoki_stdll_libpkcs11_4758_la_SOURCES = host_api.c util.c INCLUDES = $(SCC_INC_DIRS) -I/usr/include -I. -I../../../include/pkcs11/stdll \ -I../../../include/pkcs11 -install-data-local: - cd $(STDLL_PATH) && rm -f PKCS11_4758.so && \ +install-data-hook: + cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \ ln -sf libpkcs11_4758.so PKCS11_4758.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
