@matheusbsbs / matheus-bagliano / commits / 8b30ad01b4
Fork 0

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>

Teemu Likonen committed Dec 29, 2008 at 10:03 UTC 8b30ad01b421213113c64a1d3e46dcd8791d88df
1 file changed +4 -3
Documentation/Makefile
+4 -3
@@ -187,13 +187,14 @@ git.info: user-manual.texi
187
188 user-manual.texi: user-manual.xml
189 $(RM) $@+ $@
190 - $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout | $(PERL_PATH) fix-texi.perl >$@+
190 + $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \
191 + $(PERL_PATH) fix-texi.perl >$@+
192 mv $@+ $@
193
194 gitman.texi: $(MAN_XML) cat-texi.perl
195 $(RM) $@+ $@
195 - ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --to-stdout $(xml);)) | \
196 - $(PERL_PATH) cat-texi.perl $@ >$@+
196 + ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
197 + --to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+
198 mv $@+ $@
199
200 gitman.info: gitman.texi