X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=ce8882ce7b2b1494c84cb75ed6ed55586a0cf9ca;hb=5a448a463a290b59549f2ee1cf6c1b01a6043f45;hp=9a1ed6b2f3f820fd77894d9ebc2ac308b7ab6ae8;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/doc/Makefile b/doc/Makefile
index 9a1ed6b2f..ce8882ce7 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-2013 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -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
@@ -28,30 +35,38 @@ html: $(doc).html
 dvi: $(doc).dvi
 pdf: $(doc).pdf
 
-# INSTALL file with old ASCII quotation marks (looks ugly on modern machines).
+INSTALL_PRELUDE = echo '@firstparagraphindent insert'
+
+OMIT_TRAILING_EMPTY_LINES = /^$$/H; /^$$/d; x; s/\n//p; s/\n*//; x
+
+# INSTALL file with directed ASCII quotation marks.
 INSTALL: install.texi
-	$(MAKEINFO) --plaintext --no-validate $< > $@
+	$(INSTALL_PRELUDE) | cat - $< > 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
-	$(MAKEINFO) --plaintext --no-validate $< | sed -e "s/\`\([^']*\)'/'\1'/g" > $@
+INSTALL.ISO: INSTALL
+	sed -e "s/\`\([^']*\)'/'\1'/g" $< > $@
 
-# INSTALL file wit ISO 10646 (Unicode) quotation marks.
-INSTALL.UTF-8: install.texi
-	$(MAKEINFO) --plaintext --no-validate $< | 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)
+NEWEST_GNULIB_TEXI_FILE = $(shell ls -t $(GNULIB_TEXI_FILES) | sed 1q)
 
 # Date of last update. Requires GNU date.
 updated-stamp: $(GNULIB_TEXI_FILES)
-	date -u -r `ls -t $^ | sed 1q` +"@set UPDATED %F %T" > $@
+	date -u -r $(NEWEST_GNULIB_TEXI_FILE) +"@set UPDATED %F %T" > $@
 
 # Dependencies. Search for @include to find them all.
 gnulib.info gnulib.html gnulib.dvi gnulib.pdf: $(GNULIB_TEXI_FILES) updated-stamp
 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