redhat: Remove references to cumulus directory

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index c32e3e3af8138d41e87b58c9f038376c849249d7..efdf4099599ec2a05338eacac72d99d5b55769c5 100644 (file)
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -34,7 +34,7 @@
 %define                zeb_rh_src      %{zeb_src}/redhat
 %define                zeb_docs        %{zeb_src}/doc
 %define         frr_tools    %{zeb_src}/tools
-%define         cumulus_dir     %{zeb_src}/cumulus/etc
+%define         frr_tools_etc   %{frr_tools}/etc
 
 # defines for configure
 %define                _localstatedir  /var/run/frr
@@ -291,9 +291,9 @@ for daemon in %{all_daemons} ; do
 done
 %endif
 
-install %{cumulus_dir}/frr/debian.conf %{buildroot}/etc/frr
-install %{cumulus_dir}/frr/daemons %{buildroot}/etc/frr
-install -m644 %{cumulus_dir}/default/frr %{buildroot}/etc/default
+install %{frr_tools_dir}/frr/debian.conf %{buildroot}/etc/frr
+install %{frr_tools_dir}/frr/daemons %{buildroot}/etc/frr
+install -m644 %{frr_tools_dir}/default/frr %{buildroot}/etc/default
 install -m644 %{zeb_rh_src}/frr.pam \
        %{buildroot}/etc/pam.d/frr
 install -m644 %{zeb_rh_src}/frr.logrotate \