[Python-checkins] r83665 - in python/branches/release31-maint: Doc/Makefile
georg.brandl
python-checkins at python.org
Tue Aug 3 14:37:34 CEST 2010
Author: georg.brandl
Date: Tue Aug 3 14:37:34 2010
New Revision: 83665
Log:
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.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Doc/Makefile
Modified: python/branches/release31-maint/Doc/Makefile
==============================================================================
--- python/branches/release31-maint/Doc/Makefile (original)
+++ python/branches/release31-maint/Doc/Makefile Tue Aug 3 14:37:34 2010
@@ -119,7 +119,7 @@
-rm -rf tools/docutils
dist:
- -rm -rf dist
+ rm -rf dist
mkdir -p dist
# archive the HTML
@@ -141,7 +141,7 @@
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 @@
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)
More information about the Python-checkins
mailing list