LP#1551090: Updating Makefile to accommodate ubuntu-xenial target.

Changes to install pre-requisites for Unbuntu 16.04 (Xenial Xerus):

* Remove some redundancy in the extra debs lists.
* Add apache2 package to Makefile.install deb list.
* Add necessary connectivity for xenial deb installation.
* Move apache to the "install_extra_debs*" targets.
* Move debian_sys_config further down to compensate.
* Add apache2-dev dependency.
* Fix some whitespace.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index dbb21ae..7923973 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -34,8 +34,6 @@ APT_TOOL=apt-get -yq
 
 # Debian dependencies
 DEBS =  \
-       apache2-mpm-prefork\
-       apache2-prefork-dev\
        autoconf\
        automake\
        build-essential\
@@ -56,6 +54,8 @@ DEBS =  \
        libgcrypt11-dev \
        libgdbm-dev \
        liblog-log4perl-perl\
+       libmemcached-dev \
+       libmemcached-tools \
        libmodule-build-perl\
        libnet-dns-perl\
        libperl-dev\
@@ -102,6 +102,8 @@ FEDORAS = \
        libmemcached \
        libmemcached-devel \
        libtool \
+       libxml-libxml-perl \
+       libxml-libxslt-perl \
        libxml2-devel \
        libxml2-python \
        libxslt-devel \
@@ -154,37 +156,34 @@ EXTRA_DEBS = \
        libnet-server-perl
 
 EXTRA_DEBS_SQUEEZE = \
-       libmemcached-dev \
-       libmemcached-tools \
-       libxml-libxml-perl \
-       libxml-libxslt-perl
+       apache2-mpm-prefork \
+       apache2-prefork-dev 
 
 EXTRA_DEBS_WHEEZY = \
-       libmemcached-dev \
-       libmemcached-tools \
-       libxml-libxml-perl \
-       libxml-libxslt-perl \
+       apache2-mpm-prefork \
+       apache2-prefork-dev \
        libncurses5-dev
 
 EXTRA_DEBS_JESSIE = \
-       libmemcached-dev \
-       libmemcached-tools \
-       libxml-libxml-perl \
-       libxml-libxslt-perl \
+       apache2-mpm-prefork \
+       apache2-prefork-dev \
        libncurses5-dev
 
 EXTRA_DEBS_UBUNTU_PRECISE = \
-       libmemcached-dev\
-       libxml-libxml-perl \
-       libxml-libxslt-perl \
+       apache2-mpm-prefork \
+       apache2-prefork-dev \
        ncurses-dev
 
 EXTRA_DEBS_UBUNTU_TRUSTY = \
-       libmemcached-dev\
-       libxml-libxml-perl \
-       libxml-libxslt-perl \
+       apache2-mpm-prefork \
+       apache2-prefork-dev \
        ncurses-dev
 
+EXTRA_DEBS_UBUNTU_XENIAL = \
+       apache2 \
+       apache2-dev \
+       libncurses5-dev
+
 # ----------------------------------------------------------------------------
 
 all: 
@@ -203,9 +202,11 @@ fedora: install_fedora_rpms
 
 ubuntu-precise: generic_ubuntu precise
 ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
-precise: install_extra_debs install_extra_debs_precise
-trusty: install_extra_debs install_extra_debs_trusty
-generic_ubuntu: install_debs debian_sys_config
+ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods
+precise: install_extra_debs install_extra_debs_precise debian_sys_config
+trusty: install_extra_debs install_extra_debs_trusty debian_sys_config
+xenial: install_extra_debs install_extra_debs_xenial debian_sys_config
+generic_ubuntu: install_debs
 
 # ------------------------------------------------------------------
 # - DEBIAN ---------------------------------------------------------
@@ -244,6 +245,9 @@ install_extra_debs_precise:
 install_extra_debs_trusty:
        $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY)
 
+install_extra_debs_xenial:
+       $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_XENIAL)
+
 # Some OSes activate the Apache mpm_event module by default.
 # OpenSRF requires prefork.
 apache_mpm_prefork_mods: