summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--debian/frr.install1
-rw-r--r--redhat/frr.spec.in2
-rw-r--r--tools/etc/logrotate.d/frr (renamed from debian/frr.logrotate)0
4 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 8c7bde9d4c..44d2ab8e72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ EXTRA_DIST += \
\
python/xrefstructs.json \
\
- redhat/frr.logrotate \
+ tools/etc/logrotate.d/frr \
redhat/frr.pam \
redhat/frr.spec \
\
diff --git a/debian/frr.install b/debian/frr.install
index 48263222f8..044b484984 100644
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -1,6 +1,7 @@
debian/frr.conf usr/lib/tmpfiles.d
etc/
tools/etc/frr/frr.conf etc/frr/
+tools/etc/logrotate.d/frr etc/logrotate.d/
tools/frr-reload usr/lib/frr/
usr/bin/mtracebis
usr/bin/vtysh
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 8f469d2a07..afe75e1f26 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -469,7 +469,7 @@ ln -s %{_sbindir}/frrinit.sh %{buildroot}%{_initddir}/frr
install %{zeb_src}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr
install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr/frr.conf.template
install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
-install -m644 %{zeb_rh_src}/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr
+install -m644 %{zeb_src}/tools/etc/logrotate.d/frr %{buildroot}%{_sysconfdir}/logrotate.d/frr
install -d -m750 %{buildroot}%{rundir}
%if 0%{?rhel} > 7 || 0%{?fedora} > 29
diff --git a/debian/frr.logrotate b/tools/etc/logrotate.d/frr
index 735af6539b..735af6539b 100644
--- a/debian/frr.logrotate
+++ b/tools/etc/logrotate.d/frr