use Bakefiles in CVS tree

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/scripts/Bakefiles.release.bkgen b/distrib/scripts/Bakefiles.release.bkgen
index c8700ad1e16c460102ceaea9e7756a8b43f999f6..993e0dae780781b1345e33822c3d9fc6b719fa4d 100644 (file)
--- a/distrib/scripts/Bakefiles.release.bkgen
+++ b/distrib/scripts/Bakefiles.release.bkgen
@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <bakefile-gen>
-  <!-- this file is a symlink  -->
-  <include file="Bakefiles.bkgen"/>
+  <include file="../../build/bakefiles/Bakefiles.bkgen"/>
   <!-- add extra formats to release -->
   <enable-formats>dmars,dmars_smake,msevc4prj</enable-formats>
 </bakefile-gen>

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 1b4dcd3926e96a3cccc006f06e79fc6f60a19d29..c98abe08ad9efd954e6578e26de1b046f32dd3b5 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -48,7 +48,7 @@ fi
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
   cd $WX_SRC_DIR/build/bakefiles
-  bakefile_gen -d ${SCRIPTDIR}/Bakefiles.release.bkgen
+  bakefile_gen -d ${WX_SRC_DIR}/distrib/scripts/Bakefiles.release.bkgen
 fi
 
 cd $WX_SRC_DIR