From: Dan Scott <dscott@laurentian.ca>
Date: Sat, 10 Sep 2011 16:27:41 +0000 (-0400)
Subject: Fix prerequisite install on Fedora 15
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f58565e5daee8986ba601752353b51bbd268ffee;p=evergreen%2Fequinox.git

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

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;