Fix the building of gitman.info document

"makeinfo" failed to generate gitman.info from gitman.texi input file because the combined manual page file contains several nodes with the same name (DESCRIPTION, OPTIONS, SEE ALSO etc.). An Info document should contain unique node names. This patch creates a simple (read: ugly) work-around by suppressing the validation of the final Info file. Jumping to nodes in the Info document still works but they are not very useful. Common man-page headings like DESCRIPTION and OPTIONS appear in the Info node list and they point to the man page where they appear first (that is git-add currently). Also, this patch adds directory-entry information for Info document to make the document appear in the top-level Info directory. Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Teemu Likonen committed Dec 29, 2008 at 10:03 UTC 9c6c304d6a01b72d7ce20722b80ca62e01fe8356

2 files changed +7 -3

Documentation/Makefile

+1 -1

@@ -198,7 +198,7 @@ gitman.texi: $(MAN_XML) cat-texi.perl

198 mv $@+ $@

199

200 gitman.info: gitman.texi

201 - $(MAKEINFO) --no-split $*.texi

201 + $(MAKEINFO) --no-split --no-validate $*.texi

202

203 $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml

204 $(RM) $@+ $@

Documentation/cat-texi.perl

+6 -2

@@ -18,8 +18,12 @@ close TMP;

19 printf '\input texinfo

20 @setfilename gitman.info

21 -@documentencoding us-ascii

22 -@node Top,,%s

21 +@documentencoding UTF-8

22 +@dircategory Development

23 +@direntry

24 +* Git Man Pages: (gitman). Manual pages for Git revision control system

25 +@end direntry

26 +@node Top,,, (dir)

27 @top Git Manual Pages

28 @documentlanguage en

29 @menu