From: Jason Stephenson <jstephenson@mvlc.org>
Date: Tue, 9 Aug 2011 17:45:45 +0000 (-0400)
Subject: Branchify patch for LP bug #802523 for rel_2_1.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcollab%2Fdyrcona%2Flp802523_2_1;p=working%2FEvergreen.git

Branchify patch for LP bug #802523 for rel_2_1.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 752ac7c523..8c6c86d071 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -254,6 +254,10 @@ CPAN_MODULES_MARC_RECORD = \
 CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301
 
+# Lucid needs this because the XML::RPC that comes by default is broken with Evergreen
+LUCID_CPAN = \
+	XML::RPC
+
 # ----------------------------------------------------------------------------
 
 all: 
@@ -274,7 +278,7 @@ squeeze: install_pgsql_client_debs_90  install_extra_debs_squeeze
 generic_debian:  install_debs install debian_sys_config install_cpan_force
 
 ubuntu-lucid: lucid generic_ubuntu
-lucid: install_pgsql_client_debs_90 install_extra_debs install_cpan_marc_record
+lucid: install_pgsql_client_debs_90 install_extra_debs install_cpan_marc_record install_yaz install_lucid_cpan
 generic_ubuntu: install_debs install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force
 
 # - COMMON TARGETS ---------------------------------------------------------
@@ -309,6 +313,10 @@ install_cpan_fedora:
 		echo "force install $$m" | perl -MCPAN -e shell;\
 	done
 
+# Install the CPAN modules needed for Lucid
+install_cpan_lucid:
+	for m in $(LUCID_CPAN); do perl -MCPAN -e "install \"$$m\";"; done
+
 # Install a known working version of YAZ
 install_yaz:    
 	if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi;