Support the new doc system.

diff --git a/Misc/build.sh b/Misc/build.sh
index 327a92c1f697a7acf09f8fdab21c4e124d141919..4883c0efe4cd28ef10d7c2c56c795e6e22810612 100755 (executable)
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -214,17 +214,21 @@ fi
 cd $DIR/Doc
 F="make-doc.out"
 start=`current_time`
+# XXX(nnorwitz): will there be a similar problem with the new ReST-based system?
+# Keep this code around until after the first release of 2.6a1 or 3.0a1.
+# At that point, it should be clear if this code is needed or not.
 # Doc/commontex/boilerplate.tex is expected to always have an outstanding
 # modification for the date.  When a release is cut, a conflict occurs.
 # This allows us to detect this problem and not try to build the docs
 # which will definitely fail with a conflict. 
-CONFLICTED_FILE=commontex/boilerplate.tex
-conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
+#CONFLICTED_FILE=commontex/boilerplate.tex
+#conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
+conflict_count=0
 if [ $conflict_count != 0 ]; then
     echo "Conflict detected in $CONFLICTED_FILE.  Doc build skipped." > ../build/$F
     err=1
 else
-    make >& ../build/$F
+    make html >& ../build/$F
     err=$?
 fi
 update_status "Making doc" "$F" $start
@@ -238,6 +242,6 @@ echo "</body>" >> $RESULT_FILE
 echo "</html>" >> $RESULT_FILE
 
 ## copy results
-rsync $RSYNC_OPTS html/* $REMOTE_SYSTEM:$REMOTE_DIR
+rsync $RSYNC_OPTS build/html/* $REMOTE_SYSTEM:$REMOTE_DIR
 cd ../build
 rsync $RSYNC_OPTS index.html *.out $REMOTE_SYSTEM:$REMOTE_DIR/results/