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

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-12-03 21:40:32 -0500 (Wed, 03 Dec 2008)
New Revision: 1517

Modified:
   trunk/src/extras/Makefile.install
Log:
It's so alluring to install packages instead of compiling from source, except when the packaged versions are broken in crucial ways. Argh.


Modified: trunk/src/extras/Makefile.install
===================================================================
--- trunk/src/extras/Makefile.install	2008-11-30 05:30:44 UTC (rev 1516)
+++ trunk/src/extras/Makefile.install	2008-12-04 02:40:32 UTC (rev 1517)
@@ -203,15 +203,20 @@
 # generic CPAN modules:
 #   * DateTime::Format::ISO8601 is packaged by both Debian Lenny and Ubuntu Intrepid
 #   * JSON::XS is packaged by both Debian Lenny and Ubuntu Intrepid
-#   * XML::LibXML::XPathContext is part of libxml-libxml-perl on Debian Lenny and Ubuntu Intrepid
 #   * libnet-server-perl 0.97 is packaged on Debian Lenny and Ubuntu Intrepid
 #     - is there a specific need for 0.90?
 CPAN_MODULES = \
 	DateTime::Format::ISO8601 \
 	RHANDOM/Net-Server-0.90.tar.gz \
-	JSON::XS \
-	XML::LibXML::XPathContext
+	JSON::XS
 
+#   libxml-libxml-perl on Debian Lenny and Ubuntu Intrepid is 1.66, which
+#   has broken namespace handling. so we still need to install these from
+#   CPAN. *sigh*
+CPAN_MODULES_XML = \
+	XML::LibXML \
+	XML::LibXSLT
+
 # generic CPAN modules to force
 CPAN_MODULES_FORCE = \
 	TMTM/Class-DBI-0.96.tar.gz
@@ -228,7 +233,7 @@
 debian-lenny: generic_debian lenny
 etch: install_cpan
 lenny: install_extra_debs
-generic_debian: install_debs install_cpan_force debian_sys_config
+generic_debian: install_debs install_cpan_force install_cpan_xml debian_sys_config
 
 gentoo: install_gentoos install_gentoo_rc install_gentoo_perl install
 
@@ -239,7 +244,7 @@
 ubuntu-intrepid: generic_ubuntu intrepid
 hardy: install_cpan
 intrepid: install_extra_debs
-generic_ubuntu: install_debs install_cpan_force debian_sys_config
+generic_ubuntu: generic_debian
 
 # - COMMON TARGETS ---------------------------------------------------------
 
@@ -251,6 +256,10 @@
 install_cpan_force: 
 	for m in $(CPAN_MODULES_FORCE); do perl -MCPAN -e "CPAN::Shell->force(qw#install $$m#);"; done
 
+# Install the CPAN XML modules
+install_cpan_xml: 
+	for m in $(CPAN_MODULES_XML); do perl -MCPAN -e "install \"$$m\";"; done
+
 # Install ejabberd from official project installer binary
 install_ejabberd:    
 	if [ ! -f $(EJABBERD_PKG).gz ]; then wget $(EJABBERD_HOST)/$(EJABBERD_VER)/$(EJABBERD_PKG).gz; fi;