[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 8d578c3dfff71f0bfb2986cf2ca6c2caa12d88a5

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_0 has been updated
       via  8d578c3dfff71f0bfb2986cf2ca6c2caa12d88a5 (commit)
      from  5cac34c29df688a37459183a0413b0f5baa941fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8d578c3dfff71f0bfb2986cf2ca6c2caa12d88a5
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon Jul 25 20:09:18 2011 -0400

    Ubuntu Lucid needs MARC::Record from CPAN
    
    As Ubuntu Lucid ships with MARC::Record 2.0.0, and Serials requires
    2.0.1 or greater, we must install MARC::Record from CPAN or face failing
    open-ils.search requests.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 0f2a580..b736af4 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -249,10 +249,12 @@ CPAN_MODULES_MARC = \
 	Business::ISBN \
 	Business::ISBN::Data \
 	MARC::Charset \
-	MARC::Record \
 	MARC::File::XML \
 	Net::Z3950::ZOOM
 
+CPAN_MODULES_MARC_RECORD = \
+	MARC::Record
+
 CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301
 
@@ -280,7 +282,7 @@ generic_debian:  install_debs install debian_sys_config install_cpan_force
 ubuntu-hardy: hardy generic_ubuntu
 ubuntu-lucid: lucid generic_ubuntu
 hardy: install_pgsql_client_debs_82 install_yaz install_cpan_marc install_extra_encode
-lucid: install_pgsql_client_debs_84 install_extra_debs
+lucid: install_pgsql_client_debs_84 install_extra_debs install_cpan_marc_record
 generic_ubuntu: install_debs install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force
 
 # - COMMON TARGETS ---------------------------------------------------------
@@ -293,9 +295,12 @@ install_cpan_more:
 	for m in $(CPAN_MODULES_MORE); do perl -MCPAN -e "install \"$$m\";"; done
 
 # Install the CPAN modules for MARC functionality
-install_cpan_marc: 
+install_cpan_marc: install_cpan_marc_record
 	for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
 
+install_cpan_marc_record:
+	for m in $(CPAN_MODULES_MARC_RECORD); do perl -MCPAN -e "install \"$$m\";"; done
+
 install_cpan_force:
 	for m in $(CPAN_MODULES_FORCE); do \
 		echo "force install $$m" | perl -MCPAN -e shell ;\

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS