From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 4 May 2017 16:22:50 +0000 (-0400)
Subject: redhat: Remove references to cumulus directory
X-Git-Tag: reindent-master-before~193^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0b4b83800c5dbabe8fc1fdada33b400e13368df5;p=matthieu%2Ffrr.git

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 c32e3e3af8..efdf409959 100644
--- 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 \