Refresh dynamic link cache after libjs install
authorDan Scott <dscott@laurentian.ca>
Sat, 10 Sep 2011 16:28:32 +0000 (12:28 -0400)
committerDan Scott <dscott@laurentian.ca>
Sun, 2 Oct 2011 16:09:03 +0000 (12:09 -0400)
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>
Open-ILS/src/extras/Makefile.install

index 96aa3ca..58441dd 100644 (file)
@@ -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;