update to 2.7.1-rc

[wxWidgets.git] / distrib / scripts / pre-flight.sh

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 630bd70fe14cc41bed53cccab66f0105cb2e7d1b..41f6988314f342bd846ab129c6a4fda25622343f 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -48,6 +48,10 @@ fi
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
   cd $WX_SRC_DIR/build/bakefiles
+  # always rebuild the bakefiles to avoid conflicts with cvs
+  ## better to not use unix2dos on the wxWidgets tree so we don't get the conflicts
+  ##fix this -B gave an option not recognised  error (sf bug 1537221)...
+  rm .ba*
   bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen
 fi