summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-06-05 23:19:56 +0300
committerunknown <monty@narttu.mysql.fi>2003-06-05 23:19:56 +0300
commit824dd7f54587b602140bcb5af16454608538aa0a (patch)
tree262b026a37276f13ac5572835943172302a211d0 /scripts
parentcc66b447ec81a99a55f5f8a62b4b9b14c6fc3bcd (diff)
downloadmariadb-git-824dd7f54587b602140bcb5af16454608538aa0a.tar.gz
After merge fixes
mysql-test/r/repair_part1.result: Rename: mysql-test/r/repair.result -> mysql-test/r/repair_part1.result mysql-test/t/repair_part1.test: Rename: mysql-test/t/repair.test -> mysql-test/t/repair_part1.test include/sql_common.h: Declare not_error_sqlstate scripts/Makefile.am: Added back fill_help_tables.sql
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 29cfad11220..6006222992e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -33,7 +33,6 @@ bin_SCRIPTS = @server_scripts@ \
mysql_explain_log \
mysql_tableinfo \
mysqld_multi \
- fill_help_tables \
mysql_create_system_tables
EXTRA_SCRIPTS = make_binary_distribution.sh \
@@ -140,5 +139,7 @@ SUFFIXES = .sh
# Don't update the files from bitkeeper
%::SCCS/s.%
-all: make_win_src_distribution make_binary_distribution
+all: fill_help_tables.sql make_win_src_distribution make_binary_distribution
+fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
+ ./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql