summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-03 12:37:19 +0000
committerGeorg Brandl <georg@python.org>2010-08-03 12:37:19 +0000
commit10c78a78a76d064cd5d4879bf9a40bcc7376c582 (patch)
treeee708a3124ccae1cd4ba098ce9d67b29a0ff2454
parent6ff81bf4cb041a76a182f66dd8f41b57c6437315 (diff)
downloadcpython-git-10c78a78a76d064cd5d4879bf9a40bcc7376c582.tar.gz
Merged revisions 83663 via svnmerge from
svn+ssh://pythondev@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 f62b25ba65..d48c991daf 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -120,7 +120,7 @@ clean:
-rm -rf tools/docutils
dist:
- -rm -rf dist
+ rm -rf dist
mkdir -p dist
# archive the HTML
@@ -142,7 +142,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)
@@ -150,7 +150,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)