Dividing Fedora-only and CentOS-only RPMs into their own lists.

Adding targets to accommodate.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 43844bf..e379b01 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -95,7 +95,6 @@ RPMS = \
        automake \
        check \
        check-devel \
-       ejabberd \
        expat-devel \
        gcc \
        gdbm-devel \
@@ -115,9 +114,6 @@ RPMS = \
        memcached \
        mod_perl \
        perl-Cache-Memcached \
-       perl-Class-DBI \
-       perl-Class-DBI-AbstractSearch \
-       perl-Class-DBI-SQLite \
        perl-DateTime-Format-Builder \
        perl-DateTime-Format-ISO8601 \
        perl-DateTime-Format-Mail \
@@ -131,7 +127,6 @@ RPMS = \
        perl-Module-Build \
        perl-Net-DNS \
        perl-Net-Server \
-       perl-SQL-Abstract-Limit \
        perl-Template-Toolkit \
        perl-Test-Deep \
        perl-Test-Exception \
@@ -184,6 +179,16 @@ EXTRA_DEBS_UBUNTU_BIONIC = \
        apache2-dev \
        libncurses5-dev
 
+EXTRA_RPMS_FEDORA = \
+       ejabberd \
+       perl-Class-DBI \
+       perl-Class-DBI-AbstractSearch \
+       perl-Class-DBI-SQLite \
+       perl-SQL-Abstract-Limit 
+
+EXTRA_RPMS_CENTOS = \
+       cpan
+
 CPAN_MODULES_CENTOS = \
     Class::DBI \
     Class::DBI::AbstractSearch \
@@ -202,8 +207,8 @@ stretch: install_extra_debs install_extra_debs_stretch debian_sys_config
 jessie: install_extra_debs_jessie debian_sys_config
 generic_debian: install_debs
 
-fedora: install_rpms
-centos: install_epel install_rpms install_cpan_modules_centos
+fedora: install_rpms install_extra_rpms_fedora
+centos: install_epel install_rpms install_extra_rpms_centos install_cpan_modules_centos
 
 ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
 ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod
@@ -260,12 +265,17 @@ install_epel:
        yum -y install epel-release
        yum update -y
 
+install_extra_rpms_centos:
+       yum -y install $(EXTRA_RPMS_CENTOS)
+
 install_cpan_modules_centos:
        for m in $(CPAN_MODULES_CENTOS); do cpan $$m; done;
-    
 
 # Fedora/CentOS
 install_rpms:
        yum -y install $(RPMS)
 
+install_extra_rpms_fedora:
+       yum -y install $(EXTRA_RPMS_FEDORA)
+
 # vim:noet:sw=4:ts=4: