From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 20 Nov 2008 02:56:56 +0000 (+0000)
Subject: Force Class::DBI 0.96 install
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=06b9525831be2270c7c2d50c8d5cfd714a4faa3e;p=Evergreen.git

Force Class::DBI 0.96 install

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11276 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index cbd4d5140f..6d743b3c0a 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -139,8 +139,7 @@ DEBS =  \
 	ntpdate\
 	psmisc\
 	python-dev\
-	python-setuptools\
-	syslog-ng
+	python-setuptools
 
 CENTOS = \
 	apr-util-devel \
@@ -302,7 +301,6 @@ DEB_APACHE_MODS = \
 # generic CPAN modules
 CPAN_MODULES = \
     DateTime::Format::ISO8601 \
-    TMTM/Class-DBI-0.96.tar.gz \
     RHANDOM/Net-Server-0.90.tar.gz \
     MARC::Charset MARC::File::XML \
     JSON::XS \
@@ -311,6 +309,9 @@ CPAN_MODULES = \
 	Business::CreditCard::Object \
 	XML::LibXML::XPathContext
 
+# generic CPAN modules to force the install
+CPAN_MODULES_FORCE = \
+    TMTM/Class-DBI-0.96.tar.gz
 
 # ----------------------------------------------------------------------------
 
@@ -337,6 +338,7 @@ ubuntu: install_pgsql_ubuntu install_debs install debian_sys_config
 # Install the CPAN modules
 install_cpan: 
 	for m in $(CPAN_MODULES); do perl -MCPAN -e "install \"$$m\";"; done
+	for m in $(CPAN_MODULES_FORCE); do perl -MCPAN -e "CPAN::Shell->force(qw#install $$m#);"; done
 
 # Install ejabberd from official project installer binary
 install_ejabberd:    
@@ -450,7 +452,7 @@ install_centos_pgsql:
 	yum -y install $(PGSQL_CENTOS)
 
 install_centos_perl:
-	for m in $(CENTOS_PERL_FORCE); do perl -MCPAN -e "CPAN::Shell->force(qw/install $$m);"; done
+	for m in $(CENTOS_PERL_FORCE); do perl -MCPAN -e "CPAN::Shell->force(qw#install $$m#);"; done
 	for m in $(CENTOS_PERL); do perl -MCPAN -e "install \"$$m\";"; done
 	for m in $(CENTOS_PERL_VERSION); do perl -MCPAN -e "CPAN::Shell->install \"$$m\";"; done
 	for m in $(CENTOS_PERL_NOTEST); do perl -MCPAN -e "CPAN::Shell->notest('install', \"$$m\";"; done