[Opensrf-commits] r1978 - tags/rel_1_4_0/src/extras (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-07-01 00:14:40 -0400 (Thu, 01 Jul 2010)
New Revision: 1978

Modified:
   tags/rel_1_4_0/src/extras/Makefile.install
Log:
Backport r1976 to add support for Ubuntu Lucid; make Karmic an alias for Lucid.
Bump libmemcached version to 0.40


Modified: tags/rel_1_4_0/src/extras/Makefile.install
===================================================================
--- tags/rel_1_4_0/src/extras/Makefile.install	2010-07-01 04:13:50 UTC (rev 1977)
+++ tags/rel_1_4_0/src/extras/Makefile.install	2010-07-01 04:14:40 UTC (rev 1978)
@@ -3,8 +3,8 @@
 #
 # Makefile to install prerequisites for OpenSRF
 #
-# Currently supports Debian (etch/lenny), Ubuntu (hardy/karmic), and Gentoo.
-# Working towards support of CentOS 5 / RHEL 5 and Fedora.
+# Currently supports Debian (etch/lenny), Ubuntu (hardy/karmic/lucid), and Gentoo.
+# Initial support for CentOS 5 / RHEL 5 and Fedora.
 # Installs Perl prereqs, libjs with Perl wrapper
 #
 # usage:
@@ -16,6 +16,8 @@
 # 	- or -
 # 	make -f Makefile.install ubuntu-karmic
 # 	- or -
+# 	make -f Makefile.install ubuntu-lucid
+# 	- or -
 # 	make -f Makefile.install centos
 # 	- or -
 # 	make -f Makefile.install rhel
@@ -27,7 +29,7 @@
 # Notes:
 #
 # 	This makefile has been tested much more with Ubuntu and Debian than
-#   CentOS, Gentoo, or RHEL.
+#   CentOS, Fedora, Gentoo, or RHEL.
 #
 # 	Gentoo (especially amd64) requires a good bit of masked package
 # 	mangling for some packages.  These are not documented here because
@@ -66,7 +68,7 @@
 AUTOMAKE_PKG=automake-1.11
 
 # libmemcached is only packaged on newer distros
-LIBMEMCACHED=libmemcached-0.35
+LIBMEMCACHED=libmemcached-0.40
 LIBMEMCACHED_HOST=http://download.tangent.org
 
 # XML::LibXSLT fails due to old libxslt
@@ -289,7 +291,7 @@
 	libjson-xs-perl \
 	libnet-server-perl
 
-EXTRA_DEBS_UBUNTU_KARMIC = \
+EXTRA_DEBS_UBUNTU_LUCID = \
 	libmemcached-dev\
 	libxml-libxml-perl \
 	libxml-libxslt-perl
@@ -336,9 +338,10 @@
 rhel: centos
 
 ubuntu-hardy: generic_ubuntu install_cpan_xml hardy
-ubuntu-karmic: generic_ubuntu karmic
+ubuntu-karmic: ubuntu-lucid
+ubuntu-lucid: generic_ubuntu lucid
 hardy: install_cpan install_libmemcached 
-karmic: install_extra_debs install_extra_debs_karmic
+lucid: install_extra_debs install_extra_debs_lucid
 generic_ubuntu: install_debs install_cpan_force debian_sys_config
 
 # - COMMON TARGETS ---------------------------------------------------------
@@ -452,8 +455,8 @@
 	$(APT_TOOL) install $(EXTRA_DEBS)
 
 # Install even more packaged dependencies on modern distros
-install_extra_debs_karmic:
-	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_KARMIC)
+install_extra_debs_lucid:
+	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_LUCID)
 
 # ------------------------------------------------------------------
 # - GENTOO ---------------------------------------------------------