[Opensrf-commits] r1500 - trunk/src/extras

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-11-19 20:27:16 -0500 (Wed, 19 Nov 2008)
New Revision: 1500

Modified:
   trunk/src/extras/Makefile.install
Log:
Force Class::DBI install, as dependencies have started making test t/11 (triggers) fail;
We don't use trigger support in Class::DBI, so forcing the install should be okay.

Also, stop installing the syslog-ng package


Modified: trunk/src/extras/Makefile.install
===================================================================
--- trunk/src/extras/Makefile.install	2008-11-20 00:37:14 UTC (rev 1499)
+++ trunk/src/extras/Makefile.install	2008-11-20 01:27:16 UTC (rev 1500)
@@ -97,8 +97,7 @@
 	psmisc\
 	python-dev\
 	python-libxml2\
-	python-setuptools\
-	syslog-ng
+	python-setuptools
 
 CENTOS = \
 	apr-util-devel \
@@ -198,11 +197,13 @@
 # generic CPAN modules
 CPAN_MODULES = \
 	DateTime::Format::ISO8601 \
-	TMTM/Class-DBI-0.96.tar.gz \
 	RHANDOM/Net-Server-0.90.tar.gz \
 	JSON::XS \
 	XML::LibXML::XPathContext
 
+# generic CPAN modules to force
+CPAN_MODULES_FORCE = \
+	TMTM/Class-DBI-0.96.tar.gz
 
 # ----------------------------------------------------------------------------
 
@@ -229,6 +230,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: