X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=e0dd430978a6f540de6c2d049b5eb45c346449b8;hb=0f5a4162a9a8361be7e1c63b8e438002bfdee945;hp=177760e9c6044448d55c05e1527488f1e472b9c6;hpb=4b6dad7e35019625bd5eb30796beebac099a7422;p=gnulib.git

diff --git a/doc/Makefile b/doc/Makefile
index 177760e9c..e0dd43097 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 # Makefile for gnulib doc.
-# Copyright (C) 2004, 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -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
@@ -34,25 +37,22 @@ pdf: $(doc).pdf
 
 INSTALL_PRELUDE = echo '@firstparagraphindent insert'
 
+OMIT_TRAILING_EMPTY_LINES = /^$$/H; /^$$/d; x; s/\n//p; s/\n*//; x
+
 # INSTALL file with old ASCII quotation marks (looks ugly on modern machines).
 INSTALL: install.texi
 	$(INSTALL_PRELUDE) | cat - $< > tmp.texi
-	$(MAKEINFO) --plaintext --no-validate tmp.texi > $@
+	$(MAKEINFO) --plaintext --no-validate tmp.texi \
+	  | sed -e '$(OMIT_TRAILING_EMPTY_LINES)' > $@
 	rm -f tmp.texi
 
 # INSTALL file with ISO 646 or ISO 8859 quotation marks.
-INSTALL.ISO: install.texi
-	$(INSTALL_PRELUDE) | cat - $< > tmpi.texi
-	$(MAKEINFO) --plaintext --no-validate tmpi.texi \
-	  | sed -e "s/\`\([^']*\)'/'\1'/g" > $@
-	rm -f tmpi.texi
-
-# INSTALL file wit ISO 10646 (Unicode) quotation marks.
-INSTALL.UTF-8: install.texi
-	$(INSTALL_PRELUDE) | cat - $< > tmpu.texi
-	$(MAKEINFO) --plaintext --no-validate tmpu.texi \
-	  | sed -e "s/\`\([^']*\)'/‘\1’/g" > $@
-	rm -f tmpu.texi
+INSTALL.ISO: INSTALL
+	sed -e "s/\`\([^']*\)'/'\1'/g" $< > $@
+
+# INSTALL file with ISO 10646 (Unicode) quotation marks.
+INSTALL.UTF-8: INSTALL
+	sed -e "s/\`\([^']*\)'/‘\1’/g" $< > $@
 
 GNULIB_TEXI_FILES = $(filter-out maintain.texi make-stds.texi standards.texi,$(wildcard *.texi)) $(wildcard posix-headers/*.texi) $(wildcard posix-functions/*.texi) $(wildcard glibc-headers/*.texi) $(wildcard glibc-functions/*.texi)
 
@@ -65,7 +65,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