[Python-checkins] r71373 - in python/branches/release26-maint: Misc/build.sh

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Apr  7 21:27:36 2009
New Revision: 71373

Log:
Merged revisions 71335 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71335 | benjamin.peterson | 2009-04-06 17:53:29 -0500 (Mon, 06 Apr 2009) | 1 line
  
  see if this helps the doc builds
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/build.sh

Modified: python/branches/release26-maint/Misc/build.sh
==============================================================================
--- python/branches/release26-maint/Misc/build.sh	(original)
+++ python/branches/release26-maint/Misc/build.sh	Tue Apr  7 21:27:36 2009
@@ -258,6 +258,7 @@
 # which will definitely fail with a conflict. 
 #CONFLICTED_FILE=commontex/boilerplate.tex
 #conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
+make clean
 conflict_count=0
 if [ $conflict_count != 0 ]; then
     echo "Conflict detected in $CONFLICTED_FILE.  Doc build skipped." > ../build/$F