r77152 to Doc/Makefile broke doc build due to (at least some) make

binaries running clean prereq after checkout.
1. So, fix the insane make call in build.sh - seems to solve it.
2. Fix a missing redirection.
3. Check in the rsync opts that actually work during upload.

diff --git a/Misc/build.sh b/Misc/build.sh
index 3f03a73356b8cd466b0bece7f92965fc7f1fa0b7..2d45af348629f6bc41a9da9411909d6bc7309087 100755 (executable)
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -55,7 +55,7 @@ REMOTE_SYSTEM="neal@dinsdale.python.org"
 REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/"
 RESULT_FILE="$DIR/build/index.html"
 INSTALL_DIR="/tmp/python-test/local"
-RSYNC_OPTS="-aC -e ssh"
+RSYNC_OPTS="-C -e ssh -rlogD"
 
 # Always run the installed version of Python.
 PYTHON=$INSTALL_DIR/bin/python
@@ -134,7 +134,7 @@ mail_on_failure() {
 
 ## setup
 cd $DIR
-make clobber /dev/null 2>&1
+make clobber > /dev/null 2>&1
 cp -p Modules/Setup.dist Modules/Setup
 # But maybe there was no Makefile - we are only building docs. Clear build:
 rm -rf build/
@@ -273,7 +273,7 @@ if [ $conflict_count != 0 ]; then
     err=1
 else
     make clean > ../build/$F 2>&1
-    make checkout update html >> ../build/$F 2>&1
+    make html >> ../build/$F 2>&1
     err=$?
 fi
 update_status "Making doc" "$F" $start