Various tool fixes, necessary to build 5.1.12-beta on Netware.

4 files changed, 15 insertions, 11 deletions

diff --git a/netware/BUILD/compile-AUTOTOOLS b/netware/BUILD/compile-AUTOTOOLS
index 20e506aa683..c93fb1b1b28 100755
--- a/netware/BUILD/compile-AUTOTOOLS
+++ b/netware/BUILD/compile-AUTOTOOLS
@@ -5,8 +5,11 @@
 
 # stop on errors
 set -e
+sed -e "s/^DIST_COMMON/#DIST_COMMON/g" storage/ndb/Makefile.am > storage/ndb/Makefile.am.$$
+mv storage/ndb/Makefile.am.$$ storage/ndb/Makefile.am
 
-for package in . ./storage/innobase
+# for package in . ./storage/innobase
+for package in .
 do
 	(cd $package
 	rm -rf config.cache autom4te.cache
@@ -14,6 +17,7 @@ do
 	autoheader
 	libtoolize --force
 	aclocal
+#	automake --verbose --add-missing --force-missing
 	automake --add-missing --force-missing
 	autoconf)
 done
diff --git a/netware/BUILD/compile-netware-START b/netware/BUILD/compile-netware-START
index 95b222994d3..8f828f34bd1 100755
--- a/netware/BUILD/compile-netware-START
+++ b/netware/BUILD/compile-netware-START
@@ -24,5 +24,4 @@ base_configs=" \
 	--prefix=N:/mysql \
 	--without-mysqlmanager \
 	--without-man \
-	--without-csv-storage-engine \
 	"
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index d8d53293b2c..f43092492bb 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -8,7 +8,7 @@ fi
 
 # The base path(in wineformat) where compilers, includes and
 # libraries are installed
-if test -z $MYDEV
+if test -z "$MYDEV"
 then
   # the default is "F:/mydev"
   export MYDEV="F:/mydev"
diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap
index 22e1569e7ca..563d316ea56 100755
--- a/netware/BUILD/nwbootstrap
+++ b/netware/BUILD/nwbootstrap
@@ -151,17 +151,18 @@ echo "making files writable..."
 cd $target_dir
 chmod -R u+rw,g+rw .
 
-# edit the mvenv file
-echo "updating the mwenv environment file..."
+## # edit the mvenv file
+## echo "updating the mwenv environment file..."
 mwenv="./netware/BUILD/mwenv"
-mv -f $mwenv $mwenv.org
-sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
-	-e "s;BUILD_DIR;$build_dir;g" \
-  -e "s;VERSION;$version;g" $mwenv.org > $mwenv
-chmod +rwx $mwenv
+## mv -f $mwenv $mwenv.org
+## sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
+## 	-e "s;BUILD_DIR;$build_dir;g" \
+##   -e "s;VERSION;$version;g" $mwenv.org > $mwenv
+## chmod +rwx $mwenv
 
 PWD=`pwd`
-SRC_DIR=`grep "^export MYDEV=" $mwenv | cut -d'=' -f2 | \
+# This line will catch the default value only, let's hope it is correct
+SRC_DIR=`grep "^ *export MYDEV=" $mwenv | cut -d'=' -f2 | \
            sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh`