From: Chris Sharp <csharp@georgialibraries.org>
Date: Sun, 27 Jan 2019 21:53:12 +0000 (-0500)
Subject: yum/dnf tweaks
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0bc2b7f70c8bcc968dd50b622df18017480374b9;p=working%2FOpenSRF.git

yum/dnf tweaks
---

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 72733a7..0d155c6 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -33,8 +33,8 @@ SHELL=/bin/bash
 LBITS=$(shell getconf LONG_BIT)
 
 APT_TOOL=apt-get -yq
-FEDORA_YUM_TOOL=dnf -y -q
-CENTOS_YUM_TOOL=yum -y -q
+FEDORA_YUM_TOOL=dnf -y
+CENTOS_YUM_TOOL=yum -y
 RPM_TOOL=rpm
 EJABBERD_URL=https://www.process-one.net/downloads/downloads-action.php?file=/ejabberd/18.12.1/
 EJABBERD_RPM=ejabberd-18.12.1-0.x86_64.rpm
@@ -212,8 +212,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 install_extra_rpms_fedora
-centos: install_epel install_rpms install_extra_rpms_centos install_cpan_modules_centos
+fedora: install_rpms_fedora install_extra_rpms_fedora
+centos: install_epel install_rpms_centos 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
@@ -283,9 +283,12 @@ install_ejabberd:
 	systemctl start ejabberd.service
 
 # Fedora/CentOS
-install_rpms:
+install_rpms_fedora:
 	$(FEDORA_YUM_TOOL) install $(RPMS)
 
+install_rpms_centos:
+	$(CENTOS_YUM_TOOL) install $(RPMS)
+
 install_extra_rpms_fedora:
 	$(FEDORA_YUM_TOOL) install $(EXTRA_RPMS_FEDORA)