X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=e131f1a93416bec119b664e5d506c2395814018f;hb=800b95c20c636e1bd2e0f1c5e1ce3f84b5089942;hp=a2b36e4116a6e24457e516ff3646c35cb7043c79;hpb=b5d21bb981778980b5f952be6075f5054a2eabd2;p=gnulib.git

diff --git a/doc/Makefile b/doc/Makefile
index a2b36e411..e131f1a93 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 # Makefile for gnulib doc.
-# Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006-2010 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -9,14 +9,18 @@ doc = gnulib
 
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo
 TEXI2HTML = $(MAKEINFO) --no-split --reference-limit=2000 --html
-%.html: %.texi
-	$(TEXI2HTML) -o $@ $<
 
 %.info: %.texi
 	LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo --no-split --reference-limit=2000 $<
 
+%.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; }
+
 %.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.'; fi; exit 1; }
+	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; }
 
 all: info html dvi
 info: $(doc).info
@@ -24,26 +28,17 @@ html: $(doc).html
 dvi: $(doc).dvi
 pdf: $(doc).pdf
 
-INSTALL_PRELUDE = \
-  echo '@firstparagraphindent insert';
-
 # 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 > $@
-	rm -f tmp.texi
+	$(MAKEINFO) --plaintext --no-validate $< > $@
 
 # 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
+	$(MAKEINFO) --plaintext --no-validate $< | sed -e "s/\`\([^']*\)'/'\1'/g" > $@
 
 # 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
+	$(MAKEINFO) --plaintext --no-validate $< | 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)