Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
daemon/Makefile.am | 34 +---------------------------------
src/Makefile.am | 14 +++++++++++++-
{daemon => src/remote}/libvirtd.pod | 0
3 files changed, 14 insertions(+), 34 deletions(-)
rename {daemon => src/remote}/libvirtd.pod (100%)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 4f682fa740..012aced9c9 100644
--- 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 \
@@ -46,16 +38,12 @@ EXTRA_DIST = \
libvirtd.uml.logrotate.in \
test_libvirtd.aug.in \
THREADS.txt \
- $(PODFILES) \
- $(MANINFILES) \
$(NULL)
BUILT_SOURCES =
if WITH_LIBVIRTD
-man8_MANS = libvirtd.8
-
confdir = $(sysconfdir)/libvirt/
conf_DATA = libvirtd.conf
@@ -301,25 +289,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
@@ -337,6 +306,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 a1e5fa573e..ff22e1f7ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2863,6 +2863,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' \
@@ -2871,7 +2881,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
@@ -2882,11 +2892,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
--
2.14.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
