undid CFLAGS to CXXFLAGS chane (rev 1.1121) which is not necessary any more; fixed...

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

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index f2482948f6389941907c29055c07afe596b3869e..37da9affd66baef5b8fcf655d4f53c02f940f1b1 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -28,7 +28,7 @@ if [ ! -d $WX_WEB_DIR ]; then
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxWebSite
 else
     cd $WX_WEB_DIR
-    cvs update -d
+    cvs update -d -P
 fi
 
 if [ ! -d $WX_SRC_DIR ]; then
@@ -38,7 +38,7 @@ if [ ! -d $WX_SRC_DIR ]; then
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
 else
     cd $WX_SRC_DIR
-    cvs update -d
+    cvs update -d -P
 fi
 
 # this is where we will store the wxAll tarball we create
@@ -126,6 +126,8 @@ else
    for g in `find ${DOCDIR} -name readme.txt` ; do
      cp $g $START_DIR/$DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
    done
+   # Rename double readme
+   mv $START_DIR/$DIST_DIR/readme-readme-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
    ## copy files ...
    mkdir ${FTPDIR}/
    cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/