From: Georg Brandl <georg@python.org>
Date: Sun, 11 Jul 2010 08:57:06 +0000 (+0000)
Subject: Merged revisions 82789 via svnmerge from
X-Git-Tag: v3.1.3rc1~525
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fd8785567752e5739a6dd47bc5d7426d00d2a51;p=python

Merged revisions 82789 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r82789 | georg.brandl | 2010-07-11 10:33:16 +0200 (So, 11 Jul 2010) | 1 line

  Silence makeindex.
........
---

diff --git a/Doc/Makefile b/Doc/Makefile
index a2724a1707..7156e5381e 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -143,6 +143,7 @@ dist:
 	# archive the A4 latex
 	-rm -r build/latex
 	make latex PAPER=a4
+	-sed -i 's/makeindex/makeindex -q/' build/latex/Makefile
 	(cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2)
 	cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-a4.zip
 	cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-a4.tar.bz2
@@ -150,6 +151,7 @@ dist:
 	# archive the letter latex
 	rm -r build/latex
 	make latex PAPER=letter
+	-sed -i 's/makeindex/makeindex -q/' build/latex/Makefile
 	(cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2)
 	cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-letter.zip
 	cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-letter.tar.bz2