daemon: move libvirtd POD manpage into src/remote/

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 69c858e4b4a83da2d110882df89d4e4a1c7eab6f..88a026e56a98f1a62603446c040df44914a23cd9 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -18,14 +18,6 @@
 
 CLEANFILES =
 
-PODFILES = \
-       libvirtd.pod \
-       $(NULL)
-
-MANINFILES = \
-       libvirtd.8.in \
-       $(NULL)
-
 DISTCLEANFILES =
 EXTRA_DIST = \
        libvirtd.conf \
@@ -45,16 +37,12 @@ EXTRA_DIST = \
        libvirtd.libxl.logrotate.in \
        libvirtd.uml.logrotate.in \
        test_libvirtd.aug.in \
-       $(PODFILES) \
-       $(MANINFILES) \
        $(NULL)
 
 BUILT_SOURCES =
 
 if WITH_LIBVIRTD
 
-man8_MANS = libvirtd.8
-
 confdir = $(sysconfdir)/libvirt/
 conf_DATA = libvirtd.conf
 
@@ -300,25 +288,6 @@ install-data-local: install-data-sasl
 uninstall-local:: uninstall-data-sasl
 endif ! WITH_LIBVIRTD
 
-POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
-
-%.8.in: %.pod
-       $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
-       if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
-       sed \
-               -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-               -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
-               < $@-t1 > $@-t2 && \
-       rm -f $@-t1 && \
-       mv $@-t2 $@
-
-%.8: %.8.in $(top_srcdir)/configure.ac
-       $(AM_V_GEN)sed \
-               -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-               -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-               < $< > $@-t && \
-       mv $@-t $@
-
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
 if WITH_SASL
@@ -336,6 +305,5 @@ uninstall-data-sasl:
 endif ! WITH_SASL
 
 
-CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
+CLEANFILES += $(BUILT_SOURCES)
 CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
-MAINTAINERCLEANFILES = $(MANINFILES)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7bdcb1113aba2f9ab4f7d8ec4b042f244d1592bf..e1a9faa5450981108592bf6c26b8b33058d76136 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2865,6 +2865,16 @@ virtlogd.8.in: logging/virtlogd.pod
        rm -f $@-t1 && \
        mv $@-t2 $@
 
+libvirtd.8.in: remote/libvirtd.pod
+       $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
+       if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
+       sed \
+               -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
+               -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
+               < $@-t1 > $@-t2 && \
+       rm -f $@-t1 && \
+       mv $@-t2 $@
+
 %.8: %.8.in $(top_srcdir)/configure.ac
        $(AM_V_GEN)sed \
                -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
@@ -2873,7 +2883,7 @@ virtlogd.8.in: logging/virtlogd.pod
        mv $@-t $@
 
 if WITH_LIBVIRTD
-man8_MANS = virtlockd.8 virtlogd.8
+man8_MANS = virtlockd.8 virtlogd.8 libvirtd.8
 
 conf_DATA += locking/virtlockd.conf logging/virtlogd.conf
 
@@ -2884,11 +2894,13 @@ endif WITH_LIBVIRTD
 PODFILES = \
        locking/virtlockd.pod \
        logging/virtlogd.pod \
+       remote/libvirtd.pod \
        $(NULL)
 
 MANINFILES = \
        virtlockd.8.in \
        virtlogd.8.in \
+       libvirtd.8.in \
        $(NULL)
 
 CLEANFILES += test_virtlockd.aug test_virtlogd.aug $(man8_MANS)

diff --git a/daemon/libvirtd.pod b/src/remote/libvirtd.pod
similarity index 100%
rename from daemon/libvirtd.pod
rename to src/remote/libvirtd.pod