summaryrefslogtreecommitdiff
path: root/netware/BUILD
diff options
context:
space:
mode:
authorunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-12-13 18:44:20 +0200
committerunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-12-13 18:44:20 +0200
commitbc72c684505abf596b7b038205d3bd7d785e49e3 (patch)
treecd8f99755a7a861f47b673fbd9501271deb1f5ed /netware/BUILD
parenta0a942fb6f365ffb48d120b61b8e2a2a5c52f0fb (diff)
parent120466962061ba50d5de5326258c15848bcc2910 (diff)
downloadmariadb-git-bc72c684505abf596b7b038205d3bd7d785e49e3.tar.gz
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 netware/libmysql.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/perror.def: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/tztime.cc: Auto merged netware/BUILD/compile-linux-tools: Merged from 4.1 netware/my_print_defaults.def: Merged from 4.1 netware/mysqladmin.def: Merged from 4.1
Diffstat (limited to 'netware/BUILD')
-rwxr-xr-xnetware/BUILD/compile-linux-tools5
1 files changed, 3 insertions, 2 deletions
diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 26ac1d79f37..14422ea5a3f 100755
--- a/netware/BUILD/compile-linux-tools
+++ b/netware/BUILD/compile-linux-tools
@@ -28,7 +28,8 @@ rm -f */*.linux
./configure --without-innodb --without-docs
# build tools only
-make clean all-local
+make clean
+make
# Create mysql_version.h which was deleted my previous step
./config.status include/mysql_version.h
@@ -55,7 +56,7 @@ make clean all-local
# copying required linux tools
cp extra/comp_err extra/comp_err.linux
cp libmysql/conf_to_src libmysql/conf_to_src.linux
-cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
+#cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
cp sql/gen_lex_hash sql/gen_lex_hash.linux
cp strings/conf_to_src strings/conf_to_src.linux