[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. f3f53c00971353bb81663ab69422c48aabd50a5d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_0 has been updated
       via  f3f53c00971353bb81663ab69422c48aabd50a5d (commit)
      from  8190509f88c61870ed151b10bccb9d2c635f5371 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f3f53c00971353bb81663ab69422c48aabd50a5d
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sat Sep 10 12:28:32 2011 -0400

    Refresh dynamic link cache after libjs install
    
    The build of SpiderMonkey can fail if it can't find the freshly
    installed libjs library, so run ldconfig after building libjs to avoid
    that bit o' fun.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 96aa3ca..58441dd 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -358,8 +358,14 @@ install_libjs:
 	mkdir -p $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
-	cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/
-	cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/
+	if [ ! -z $(FEDORA_64) ]; then \
+		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib64/ && \
+		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib64/; \
+	else \
+		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ && \
+		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/; \
+	fi;
+	ldconfig
 
 install_spidermonkey:
 	if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS