[Opensrf-commits] r1860 - branches/rel_1_2/src/extras (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-11-20 15:46:51 -0500 (Fri, 20 Nov 2009)
New Revision: 1860

Modified:
   branches/rel_1_2/src/extras/Makefile.install
Log:
Backport Ubuntu Karmic prereq install target to 1.2 branch


Modified: branches/rel_1_2/src/extras/Makefile.install
===================================================================
--- branches/rel_1_2/src/extras/Makefile.install	2009-11-20 15:45:49 UTC (rev 1859)
+++ branches/rel_1_2/src/extras/Makefile.install	2009-11-20 20:46:51 UTC (rev 1860)
@@ -3,7 +3,7 @@
 #
 # Makefile to install prerequisites for OpenSRF
 #
-# Currently supports Debian (etch/lenny), Ubuntu (gutsy/hardy/intrepid), and Gentoo.
+# Currently supports Debian (etch/lenny), Ubuntu (gutsy/hardy/intrepid/karmic), and Gentoo.
 # Working towards support of CentOS 5 / RHEL 5.
 # Installs Perl prereqs, libjs with Perl wrapper
 #
@@ -18,6 +18,8 @@
 # 	- or -
 # 	make -f Makefile.install ubuntu-intrepid
 # 	- or -
+# 	make -f Makefile.install ubuntu-karmic
+# 	- or -
 # 	make -f Makefile.install centos
 # 	- or -
 # 	make -f Makefile.install rhel
@@ -202,6 +204,10 @@
 	libjson-xs-perl \
 	libnet-server-perl
 
+EXTRA_DEBS_UBUNTU_KARMIC = \
+	libxml-libxml-perl \
+	libxml-libxslt-perl
+
 # 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
@@ -241,12 +247,14 @@
 
 rhel: centos
 
-ubuntu-gutsy: generic_ubuntu hardy 
-ubuntu-hardy: generic_ubuntu hardy
-ubuntu-intrepid: generic_ubuntu intrepid
+ubuntu-gutsy: generic_ubuntu install_cpan_xml hardy 
+ubuntu-hardy: generic_ubuntu install_cpan_xml hardy
+ubuntu-intrepid: generic_ubuntu install_cpan_xml intrepid
+ubuntu-karmic: generic_ubuntu karmic
 hardy: install_cpan
 intrepid: install_extra_debs
-generic_ubuntu: generic_debian
+karmic: install_extra_debs install_extra_debs_karmic
+generic_ubuntu: install_debs install_cpan_force debian_sys_config
 
 # - COMMON TARGETS ---------------------------------------------------------
 
@@ -315,6 +323,10 @@
 install_extra_debs:
 	$(APT_TOOL) install $(EXTRA_DEBS)
 
+# Install even more packaged dependencies on modern distros
+install_extra_debs_karmic:
+	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_KARMIC)
+
 # ------------------------------------------------------------------
 # - GENTOO ---------------------------------------------------------