distro: move kresd.systemd man page

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 963bf9c54b1cfdcada9ad8bc73bdf40ddec3a507..c30cc944ad177975d8794056ad86012139372569 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -49,7 +49,7 @@ package() {
        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-control@.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control@.socket"
        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
-       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/doc/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
+       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
        install -dm 0775 "${pkgdir}/etc/knot-resolver"
        install -Dm 0644 "${srcdir}/kresd.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"

diff --git a/doc/kresd.systemd.7 b/distro/common/systemd/kresd.systemd.7
similarity index 100%
rename from doc/kresd.systemd.7
rename to distro/common/systemd/kresd.systemd.7

diff --git a/distro/deb/debian/knot-resolver.manpages b/distro/deb/debian/knot-resolver.manpages
index 5ff01b817f8c9758e57ccb6183674163062807fa..9f97677b962de1a8a481cf8fd052f7dedc5265ca 100644 (file)
--- a/distro/deb/debian/knot-resolver.manpages
+++ b/distro/deb/debian/knot-resolver.manpages
@@ -1,2 +1,2 @@
 debian/tmp/usr/share/man/man8/kresd.8
-doc/kresd.systemd.7
+distro/common/systemd/kresd.systemd.7

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 5fdd6b2f509a668ced461e3231dbafdb52933cb8..2c2c1c3cdfe55132b29c60836ba6721208e7cb01 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -140,7 +140,7 @@ install -m 0664 -p %SOURCE3 %{buildroot}%{_sysconfdir}/knot-resolver/root.keys
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 -p %{repodir}/systemd/kresd@.service %{buildroot}%{_unitdir}/kresd@.service
 mkdir -p %{buildroot}%{_mandir}/man7
-install -m 0644 -p %{repodir}/doc/kresd.systemd.7 %{buildroot}%{_mandir}/man7/kresd.systemd.7
+install -m 0644 -p %{repodir}/distro/common/systemd/kresd.systemd.7 %{buildroot}%{_mandir}/man7/kresd.systemd.7
 
 %if 0%{?rhel}
 # no socket activation for CentOS 7 (requires systemd.227)

diff --git a/systemd/README.md b/systemd/README.md
index 3422d1ae9fd9402806294fcda06ef98472332351..3d8a8db86209200a7467c08e141ec37b178a62a3 100644 (file)
--- a/systemd/README.md
+++ b/systemd/README.md
@@ -22,7 +22,7 @@ Notes
 -----
 
 *  If you're using the upstream systemd unit files, don't forget to also include
-   doc/kresd.systemd.7 manual page in the package.
+   kresd.systemd.7 manual page in the package.
 *  Distributions using systemd-sysv-generator should mask kresd.service to
    be consistent with other distributions. Any use of kresd.service instead of
    kresd@N.service is discouraged to avoid confusing the users.