[open-ils-commits] r11276 - trunk/Open-ILS/src/extras

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-11-19 21:56:56 -0500 (Wed, 19 Nov 2008)
New Revision: 11276

Modified:
   trunk/Open-ILS/src/extras/Makefile.install
Log:
Force Class::DBI 0.96 install

Modified: trunk/Open-ILS/src/extras/Makefile.install
===================================================================
--- trunk/Open-ILS/src/extras/Makefile.install	2008-11-20 02:51:34 UTC (rev 11275)
+++ trunk/Open-ILS/src/extras/Makefile.install	2008-11-20 02:56:56 UTC (rev 11276)
@@ -139,8 +139,7 @@
 	ntpdate\
 	psmisc\
 	python-dev\
-	python-setuptools\
-	syslog-ng
+	python-setuptools
 
 CENTOS = \
 	apr-util-devel \
@@ -302,7 +301,6 @@
 # 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 @@
 	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 @@
 # 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 @@
 	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