X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=07ba184efac591e38c4636145534bb02fc8069f1;hb=d2b8ab669f3129ac0d349eead1217adc38d795eb;hp=177760e9c6044448d55c05e1527488f1e472b9c6;hpb=4226cf28cbf8b81423e6a1ee4075020f55e320d8;p=gnulib.git

diff --git a/doc/Makefile b/doc/Makefile
index 177760e9c..07ba184ef 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -14,6 +14,9 @@ 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
 	$(MAKEINFO) $(manual_opts) $<
 
@@ -21,10 +24,10 @@ TEXI2HTML = $(MAKEINFO) $(manual_opts) --html
 	$(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
@@ -65,7 +68,7 @@ gnulib.info gnulib.html gnulib.dvi gnulib.pdf: $(GNULIB_TEXI_FILES) updated-stam
 standards.info standards.html standards.dvi: standards.texi make-stds.texi fdl.texi
 
 mostlyclean:
-	rm -f *.aux *.cp *.cps *.fn *.ky *.log *.pg *.toc *.tp *.vr *.vrs
+	rm -f *.aux *.cn *.cp *.cps *.fn *.ky *.log *.pg *.toc *.tp *.vr *.vrs
 	rm -f updated-stamp
 
 clean: mostlyclean