Force Class::DBI install, as dependencies have started making test t/11 (triggers...

We don't use trigger support in Class::DBI, so forcing the install should be okay.

Also, stop installing the syslog-ng package

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1500 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 4e3b780..0390f58 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -97,8 +97,7 @@ DEBS =  \
        psmisc\
        python-dev\
        python-libxml2\
-       python-setuptools\
-       syslog-ng
+       python-setuptools
 
 CENTOS = \
        apr-util-devel \
@@ -198,11 +197,13 @@ 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 \
        JSON::XS \
        XML::LibXML::XPathContext
 
+# generic CPAN modules to force
+CPAN_MODULES_FORCE = \
+       TMTM/Class-DBI-0.96.tar.gz
 
 # ----------------------------------------------------------------------------
 
@@ -229,6 +230,7 @@ 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: