summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-03 12:37:34 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-03 12:37:34 (GMT)
commit203947fa590996f4811c787cb85d1d366a77faee (patch)
tree1b9bce9574395423106d21623effe6638362cd18
parent224cea189220a6b44a510154044d75500737d85c (diff)
downloadcpython-203947fa590996f4811c787cb85d1d366a77faee.zip
cpython-203947fa590996f4811c787cb85d1d366a77faee.tar.gz
cpython-203947fa590996f4811c787cb85d1d366a77faee.tar.bz2
Merged revisions 83663 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r83663 | georg.brandl | 2010-08-03 14:36:57 +0200 (Di, 03 Aug 2010) | 1 line A couple of nits how to ignore errors. ........
-rw-r--r--Doc/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index 7156e53..5c39d8b 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -119,7 +119,7 @@ clean:
-rm -rf tools/docutils
dist:
- -rm -rf dist
+ rm -rf dist
mkdir -p dist
# archive the HTML
@@ -141,7 +141,7 @@ dist:
rm dist/python-$(DISTVERSION)-docs-text.tar
# archive the A4 latex
- -rm -r build/latex
+ rm -rf 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)
@@ -149,7 +149,7 @@ dist:
cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-a4.tar.bz2
# archive the letter latex
- rm -r build/latex
+ rm -rf 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)