diff options
| author |  Teemu Likonen <tlikonen@iki.fi> | 2008-12-29 10:03:08 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-29 00:40:04 -0800 |
| commit | 8b30ad01b421213113c64a1d3e46dcd8791d88df (patch) | |
| tree | e4da8955ab59a2814fd0a8f4c0a8ea637e5b9e8d | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-8b30ad01b421213113c64a1d3e46dcd8791d88df.tar.xz | |
Fix the building of user-manual.texi and gitman.texi documents
Previously "docbook2x-texi" failed to generate user-manual.texi and
gitman.texi files from .xml input files because "iconv" stopped at
"illegal input sequence" error. This was due to some UTF-8 octets in the
input .xml files. This patch adds option --encoding=UTF-8 for
"docbook2x-texi" to allow the building of .texi files complete.
Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index c34c1cae20..c41a7b483c 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -187,13 +187,14 @@ git.info: user-manual.texi user-manual.texi: user-manual.xml $(RM) $@+ $@ - $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout | $(PERL_PATH) fix-texi.perl >$@+ + $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \ + $(PERL_PATH) fix-texi.perl >$@+ mv $@+ $@ gitman.texi: $(MAN_XML) cat-texi.perl $(RM) $@+ $@ - ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --to-stdout $(xml);)) | \ - $(PERL_PATH) cat-texi.perl $@ >$@+ + ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \ + --to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+ mv $@+ $@ gitman.info: gitman.texi |