X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=07a30df12f4f3cd3e96fe8fe7d4eedcdc1e44f5f;hb=0ff8eeaf685c4435041d204035de6bc28864e38a;hp=c40359bb07e8e34b95cc2e4790800b4bb866d898;hpb=05efa9eaa5690bb85220bcc6af38eb18714c90a9;p=gnulib.git

diff --git a/doc/Makefile b/doc/Makefile
index c40359bb0..07a30df12 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,20 +7,27 @@
 
 doc = gnulib
 
-MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo
-TEXI2HTML = $(MAKEINFO) --no-split --reference-limit=2000 --html
+lang_env = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE=
+makeinfo_prog = makeinfo
+MAKEINFO = $(lang_env) $(makeinfo_prog)
+
+manual_opts = --no-split --reference-limit=2000
+TEXI2HTML = $(MAKEINFO) $(manual_opts) --html
+
+# Needed so that tex finds a recent enough texinfo.tex.
+tex_opts = -I ../build-aux
 
 %.info: %.texi
-	LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo --no-split --reference-limit=2000 $<
+	$(MAKEINFO) $(manual_opts) $<
 
 %.html: %.texi
 	$(TEXI2HTML) -o $@ $<
 
 %.dvi: %.texi
-	texi2dvi $< || { if texi2dvi $< 2>/dev/null | grep 'TeX capacity exceeded, sorry \[save size=' > /dev/null; then echo '*** You must increase the save_size in your texmf.cnf file, often located under /etc/texmf/.'; fi; exit 1; }
+	texi2dvi $(tex_opts) $< || { if texi2dvi $(tex_opts) $< 2>/dev/null | grep 'TeX capacity exceeded, sorry \[save size=' > /dev/null; then echo '*** You must increase the save_size in your texmf.cnf file, often located under /etc/texmf/.'; fi; exit 1; }
 
 %.pdf: %.texi
-	texi2pdf $< || { if texi2pdf $< 2>/dev/null | grep 'TeX capacity exceeded, sorry \[save size=' > /dev/null; then echo '*** You must increase the save_size in your texmf.cnf file, often located under /etc/texmf/.'; fi; exit 1; }
+	texi2pdf $(tex_opts) $< || { if texi2pdf $(tex_opts) $< 2>/dev/null | grep 'TeX capacity exceeded, sorry \[save size=' > /dev/null; then echo '*** You must increase the save_size in your texmf.cnf file, often located under /etc/texmf/.'; fi; exit 1; }
 
 all: info html dvi
 info: $(doc).info