Merged revisions 78924 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r78924 | georg.brandl | 2010-03-13 14:42:16 +0100 (Sa, 13 Mär 2010) | 9 lines
Merged revisions 78921 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78921 | georg.brandl | 2010-03-13 14:39:46 +0100 (Sa, 13 Mär 2010) | 1 line
Change/fix handling of docs download location: for daily builds, put them right next to the HTML.
........
................
diff --git a/Doc/Makefile b/Doc/Makefile
index 8e56855..a2724a1 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -157,16 +157,17 @@
check:
$(PYTHON) tools/rstlint.py -i tools
-# Targets for automatic doc build
+# Targets for daily automated doc build
# for development releases: always build
autobuild-dev:
make update
- make dist
+ make dist SPHINXOPTS='-A daily=1'
-# for stable releases: only build if not in development mode
+# for stable releases: only build if not in pre-release stage (alpha, beta, rc)
autobuild-stable:
@case $(DISTVERSION) in *[abc]*) \
- echo "Not building; not a release version."; exit 1;; \
+ echo "Not building; $(DISTVERSION) is not a release version."; \
+ exit 1;; \
esac
@make autobuild-dev