From: Dan Scott <dscott@laurentian.ca>
Date: Sat, 10 Sep 2011 16:28:32 +0000 (-0400)
Subject: Refresh dynamic link cache after libjs install
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f3f53c00971353bb81663ab69422c48aabd50a5d;p=contrib%2FConifer.git

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@laurentian.ca>
---

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 96aa3caab8..58441ddf1b 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;