From: Ben Pfaff <blp@nicira.com>
Date: Wed, 26 Oct 2011 23:11:32 +0000 (-0700)
Subject: Improve manpage checking rule.
X-Git-Tag: v1.4.0~244
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1261619f8958b81df97bb45c1b27ca14aa43a3b4;p=sliver-openvswitch.git

Improve manpage checking rule.

The coverage of the previous version of this rule was incomplete because
$(MANS) does not include $(noinst_man_MANS).   (Also, $(MANS) is
undocumented.)  Writing it out as the list of manpages variables that
Open vSwitch uses is better.

Also, the previous version of the rule didn't actually signal an error
when warnings appeared.  It looks like troff doesn't have a way to indicate
warnings as part of its exit status, so instead we grep the output for
"warning".
---

diff --git a/Makefile.am b/Makefile.am
index d7144282d..401d23ad6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,12 +154,14 @@ rate-limit-check:
 
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
-manpage-check: $(MANS) $(MAN_FRAGMENTS)
-	@manpages=; \
-	for d in $(MANS); do \
-		manpages="$$manpages `test -f $$d || echo $(VPATH)/`$$d"; \
+manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
+	@error=false; \
+	for manpage in $?; do \
+		LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T ascii -man -p -z $$manpage >$@.tmp 2>&1; \
+		if grep warning: $@.tmp; then error=:; fi; \
+		rm -f $@.tmp; \
 	done; \
-	LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T ascii -man -p -z $$manpages && touch $@
+	if $$error; then exit 1; else echo touch $@; touch $@; fi
 CLEANFILES += manpage-check
 endif