summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2014-10-12 11:11:01 +0200
committerWerner Lemberg <wl@gnu.org>2014-10-12 11:11:01 +0200
commit8c46708258433a331f77e1a34729d74f0b7f5859 (patch)
treeb0c08c071c8cdfd5cd15a020e6b8d12fa4ddc322
parent72c9c8f857c79ee48ee4f0a3c4c00ec84758e734 (diff)
downloadgroff-git-8c46708258433a331f77e1a34729d74f0b7f5859.tar.gz
[doc] Improve call to generation of `groff.pdf'.
Problem reported by Axel Kielhorn <tex@axelkielhorn.de>. Since `groff.texinfo' contains latin-1 characters, some sed implementations (like the one used on Mac OS 10.8) fail if called with the wrong locale. Basically, this is a `texi2dvi' bug, but we can set `LANG' by ourselves to improve the situation. * doc/Makefile.in (.texinfo.dvi, .texinfo.pdf): Set `LANG' environment variable to empty string.
-rw-r--r--ChangeLog15
-rw-r--r--doc/Makefile.in9
2 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bd87d09d6..18dbe42b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
2014-10-12 Werner LEMBERG <wl@gnu.org>
- Correctly handle `MAKEINFO' environment variable.
+ [doc] Improve call to generation of `groff.pdf'.
+ Problem reported by Axel Kielhorn <tex@axelkielhorn.de>.
+
+ Since `groff.texinfo' contains latin-1 characters, some sed
+ implementations (like the one used on Mac OS 10.8) fail if called
+ with the wrong locale. Basically, this is a `texi2dvi' bug, but we
+ can set `LANG' by ourselves to improve the situation.
+
+ * doc/Makefile.in (.texinfo.dvi, .texinfo.pdf): Set `LANG'
+ environment variable to empty string.
+
+2014-10-12 Werner LEMBERG <wl@gnu.org>
+
+ [doc] Correctly handle `MAKEINFO' environment variable.
Bug introduced in commit from 2014-03-29.
* m4/groff.m4 (GROFF_MAKEINFO): Don't set MAKEINFO to empty string
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ba33c0e1f..cc55acb7a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -42,8 +42,9 @@ GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|:|g'`
# usually not needed (however, to build from the repo you NEED it!)
MAKEINFO=@MAKEINFO@
-# Users who want to print out the groff manual are expected to have
-# a working TeX installation.
+# Users who want to print out the groff manual are expected to have a
+# working TeX installation. Note that texi2dvi properly honours the
+# `MAKEINFO' environment variable.
TEXI2DVI=texi2dvi
groff_bin_dirs=\
@@ -101,9 +102,9 @@ imagedir=img
.texinfo.txt:
LANG= $(MAKEINFO) --enable-encoding -I$(srcdir) --plaintext -o $@ $<
.texinfo.dvi:
- MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e $<
+ LANG= MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e $<
.texinfo.pdf:
- MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e --pdf $<
+ LANG= MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e --pdf $<
.texinfo.html:
LANG= $(MAKEINFO) --enable-encoding -I$(srcdir) --html --no-split $< \
&& $(SHELL) $(srcdir)/fixinfo.sh $@