This is certainly more of a cosmetic change than anything else, moving the install script that includes our library directories in ld.so.conf from misc/Makefile.am to usr/lib/Makefile.am, but it also brings some fixes such as use -hook target instead of -local (make sure that this is run *after* everything else on this dir) and use standard pathnames variables.
Signed-off-by: Klaus Heinrich Kiwi <[email protected]> --- misc/Makefile.am | 6 ------ usr/lib/Makefile.am | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/misc/Makefile.am b/misc/Makefile.am index 9005fcf..e910a4e 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -3,10 +3,4 @@ initdir = /etc/init.d init_SCRIPTS = pkcsslotd endif -install-data-local: - mkdir -p $(DESTDIR)/etc/ld.so.conf.d - echo "$(libdir)/opencryptoki" \ - >$(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf - echo "$(libdir)/opencryptoki/stdll" \ - >>$(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf diff --git a/usr/lib/Makefile.am b/usr/lib/Makefile.am index 75e0268..5b0761f 100644 --- a/usr/lib/Makefile.am +++ b/usr/lib/Makefile.am @@ -1 +1,10 @@ SUBDIRS = pkcs11 + +install-data-hook: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/ld.so.conf.d + echo "$(DESTDIR)$(libdir)/opencryptoki" >\ + $(DESTDIR)$(sysconfdir)/ld.so.conf.d/opencryptoki-$(target_cpu).conf + echo "$(DESTDIR)$(libdir)/opencryptoki/stdll" >>\ + $(DESTDIR)$(sysconfdir)/ld.so.conf.d/opencryptoki-$(target_cpu).conf + echo "**** Remember you must run ldconfig before using the above settings ****" + -- 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
