Correcting the syntax of the install_epel target. user/csharp/centos_6_makefiles
authorChris Sharp <csharp@georgialibraries.org>
Thu, 12 Dec 2013 01:37:28 +0000 (20:37 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Thu, 12 Dec 2013 01:37:28 +0000 (20:37 -0500)
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
src/extras/Makefile.install

index 98de81e..d20fabb 100644 (file)
@@ -32,6 +32,10 @@ LBITS=$(shell getconf LONG_BIT)
 
 APT_TOOL=apt-get -yq
 
+# CentOS needs the EPEL repository
+EPEL_HOST=http://dl.fedoraproject.org/pub/epel/6/x86_64
+EPEL_PKG=epel-release-6-8.noarch.rpm
+
 # Debian dependencies
 DEBS =  \
        apache2-mpm-prefork\
@@ -231,10 +235,11 @@ install_extra_debs_precise:
 
 # CentOS
 install_epel:
-       if [ "$$(uname -r | grep el6)" ]; then \
-               wget http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm;
-               rpm -Uvh epel-release-6-8.noarch.rpm;
-       fi
+       if [ -n "$(uname -r | grep el6)" ]; then \
+               wget $(EPEL_HOST)/$(EPEL_PKG) ; \
+               rpm -Uvh $(EPEL_PKG) ;\
+       fi;
+       yum update -y
 
 # Fedora/CentOS
 install_rpms: