From f58565e5daee8986ba601752353b51bbd268ffee Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sat, 10 Sep 2011 12:27:41 -0400 Subject: [PATCH] Fix prerequisite install on Fedora 15 The postgresql package shipped in Fedora proper is just called 'postgresql-devel', so get that right. Also, try to put 64-bit libraries in the right directory. Signed-off-by: Dan Scott --- Open-ILS/src/extras/Makefile.install | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index bb69740feb..96b166263a 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -180,7 +180,7 @@ FEDORA_RPMS = \ perl-Text-CSV \ perl-Text-CSV_XS \ perl-XML-Writer \ - postgresql90-devel \ + postgresql-devel \ readline-devel \ tcp_wrappers-devel \ wget \ @@ -335,8 +335,13 @@ 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; install_spidermonkey: if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi; -- 2.11.0