]> xenbits.xensource.com Git - people/dariof/libvirt.git/commitdiff
build: check for pod errors
authorEric Blake <eblake@redhat.com>
Fri, 26 Oct 2012 15:06:54 +0000 (09:06 -0600)
committerEric Blake <eblake@redhat.com>
Fri, 26 Oct 2012 21:13:39 +0000 (15:13 -0600)
Patch 61299a1c fixed a long-standing pod error in the man page.
But we should be preventing these up front.
See also https://bugzilla.redhat.com/show_bug.cgi?id=870273

* tools/Makefile.am (virt-xml-validate.1, virt-pki-validate.1)
(virt-host-validate.1, virt-sanlock-cleanup.8, virsh.1): Reject
pod conversion errors.
* daemon/Makefile.am ($(srcdir)/libvirtd.8.in): Likewise.

daemon/Makefile.am
tools/Makefile.am

index 1643f3891e8fa8a9783a12c0b1dab016f1b16248..18a4bca5409ead00960fe488796a8af839ec1fc6 100644 (file)
@@ -384,7 +384,8 @@ POD2MAN = pod2man -c "Virtualization Support" \
                        -r "$(PACKAGE)-$(VERSION)" -s 8
 
 $(srcdir)/libvirtd.8.in: libvirtd.pod.in
-       $(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@
+       $(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@ \
+           && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
index 0d7822d3e97ac2848942fc9171054b12236b8d07..0deacee987c503e9146524d0830ba907b27f21c0 100644 (file)
@@ -61,17 +61,23 @@ virt-xml-validate: virt-xml-validate.in Makefile
            || (rm $@ && exit 1) && chmod +x $@
 
 virt-xml-validate.1: virt-xml-validate.in
-       $(AM_V_GEN)$(POD2MAN) --name VIRT-XML-VALIDATE $< $(srcdir)/$@
+       $(AM_V_GEN)$(POD2MAN) --name VIRT-XML-VALIDATE $< $(srcdir)/$@ \
+           && if grep 'POD ERROR' $(srcdir)/$@ ; then \
+               rm $(srcdir)/$@; exit 1; fi
 
 virt-pki-validate: virt-pki-validate.in Makefile
        $(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
            || (rm $@ && exit 1) && chmod +x $@
 
 virt-pki-validate.1: virt-pki-validate.in
-       $(AM_V_GEN)$(POD2MAN) --name VIRT-PKI-VALIDATE $< $(srcdir)/$@
+       $(AM_V_GEN)$(POD2MAN) --name VIRT-PKI-VALIDATE $< $(srcdir)/$@ \
+           && if grep 'POD ERROR' $(srcdir)/$@ ; then \
+               rm $(srcdir)/$@; exit 1; fi
 
 virt-host-validate.1: virt-host-validate.c
-       $(AM_V_GEN)$(POD2MAN) --name VIRT-HOST-VALIDATE $< $(srcdir)/$@
+       $(AM_V_GEN)$(POD2MAN) --name VIRT-HOST-VALIDATE $< $(srcdir)/$@ \
+           && if grep 'POD ERROR' $(srcdir)/$@ ; then \
+               rm $(srcdir)/$@; exit 1; fi
 
 virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
        $(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' \
@@ -79,7 +85,9 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
            || (rm $@ && exit 1) && chmod +x $@
 
 virt-sanlock-cleanup.8: virt-sanlock-cleanup.in
-       $(AM_V_GEN)$(POD2MAN) --name VIRT-SANLOCK-CLEANUP $< $(srcdir)/$@
+       $(AM_V_GEN)$(POD2MAN) --name VIRT-SANLOCK-CLEANUP $< $(srcdir)/$@ \
+           && if grep 'POD ERROR' $(srcdir)/$@ ; then \
+               rm $(srcdir)/$@; exit 1; fi
 
 virt_host_validate_SOURCES = \
                virt-host-validate.c \
@@ -162,7 +170,9 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc
 endif
 
 virsh.1: virsh.pod
-       $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@
+       $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \
+           && if grep 'POD ERROR' $(srcdir)/$@ ; then \
+               rm $(srcdir)/$@; exit 1; fi
 
 install-data-local: install-init install-systemd