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.
........

diff --git a/Doc/Makefile b/Doc/Makefile
index f62b25ba65c2ac07db1a2905cfe19797411afb47..d48c991daf12b67553816a2e2a7a86f497f6bb91 100644 (file)
--- 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)