[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0d789d144b7f22240ff6b86d8d91248c355db793

[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, master has been updated
       via  0d789d144b7f22240ff6b86d8d91248c355db793 (commit)
      from  fb58069857839fb5a404d15f4a403cb572da741b (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 0d789d144b7f22240ff6b86d8d91248c355db793
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 2a3afa7..f008ef3 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -246,9 +246,12 @@ CPAN_MODULES_SAFE = \
 CPAN_MODULES_MARC = \
 	Business::ISBN \
 	Business::ISBN::Data \
-    MARC::Charset \
-    MARC::File::XML \
-    Net::Z3950::ZOOM
+	MARC::Charset \
+	MARC::File::XML \
+	Net::Z3950::ZOOM
+
+CPAN_MODULES_MARC_RECORD = \
+	MARC::Record
 
 CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301
@@ -273,7 +276,7 @@ squeeze: install_pgsql_client_debs_90  install_extra_debs_squeeze
 generic_debian:  install_debs test_for_libdbi_pkg install debian_sys_config install_cpan_force
 
 ubuntu-lucid: lucid generic_ubuntu
-lucid: install_pgsql_client_debs_90 install_extra_debs
+lucid: install_pgsql_client_debs_90 install_extra_debs install_cpan_marc_record
 generic_ubuntu: install_debs test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_cpan_force
 
 # - COMMON TARGETS ---------------------------------------------------------
@@ -286,9 +289,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 |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS