accommodate yum vs. dnf

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

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index e379b01..4b41d23 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -33,6 +33,8 @@ SHELL=/bin/bash
 LBITS=$(shell getconf LONG_BIT)
 
 APT_TOOL=apt-get -yq
+FEDORA_YUM_TOOL=dnf -yq
+CENTOS_YUM_TOOL=yum -yq
 
 # Debian dependencies
 DEBS =  \
@@ -105,8 +107,8 @@ RPMS = \
        libmemcached \
        libmemcached-devel \
        libtool \
-       libxml-libxml-perl \
-       libxml-libxslt-perl \
+       perl-XML-LibXML \
+       perl-XML-LibXSLT \
        libxml2-devel \
        libxml2-python \
        libxslt-devel \
@@ -190,10 +192,10 @@ EXTRA_RPMS_CENTOS = \
        cpan
 
 CPAN_MODULES_CENTOS = \
-    Class::DBI \
-    Class::DBI::AbstractSearch \
-    Class::DBI::SQLite \
-    SQL::Abstract::Limit 
+       Class::DBI \
+       Class::DBI::AbstractSearch \
+       Class::DBI::SQLite \
+       SQL::Abstract::Limit 
 
 # ----------------------------------------------------------------------------
 
@@ -262,20 +264,20 @@ apache_perl_mod:
 
 # CentOS
 install_epel:
-       yum -y install epel-release
-       yum update -y
+       $(CENTOS_YUM_TOOL) install epel-release
+       $(CENTOS_YUM_TOOL) update
 
 install_extra_rpms_centos:
-       yum -y install $(EXTRA_RPMS_CENTOS)
+       $(CENTOS_YUM_TOOL) 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)
+       $(FEDORA_YUM_TOOL) install $(RPMS)
 
 install_extra_rpms_fedora:
-       yum -y install $(EXTRA_RPMS_FEDORA)
+       $(FEDORA_YUM_TOOL) install $(EXTRA_RPMS_FEDORA)
 
 # vim:noet:sw=4:ts=4: