- After merge fixes

BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc:
  Auto merged
BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
BitKeeper/deleted/.del-texi2html~74632fe370dcec73:
  Auto merged
configure.in:
  - manual merge
support-files/mysql.spec.sh:
  - manual merge

scripts/Makefile.am

@@ -59,7 +59,6 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			mysqld_multi.sh \
 			mysql_tableinfo.sh \
 			mysqld_safe.sh \
-			fill_help_tables.sh \
 			mysql_create_system_tables.sh
 
 EXTRA_DIST =		$(EXTRA_SCRIPTS) \
@@ -87,7 +86,6 @@ CLEANFILES =		@server_scripts@ \
 			mysqldumpslow \
 			mysqld_multi \
 			make_win_src_distribution \
-			fill_help_tables \
 			mysql_create_system_tables
 
 DISTCLEANFILES =        mysqlbug
@@ -151,7 +149,4 @@ SUFFIXES = .sh
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 
-all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
-
-fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
-		./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
+all: make_win_src_distribution make_binary_distribution make_sharedlib_distribution

scripts/fill_help_tables.sql

@@ -0,0 +1,3 @@
+-- fill_help_tables.sql - this file is a placeholder to satisfy build dependencies -
+-- it will be replaced with the appropriate content by the Boostrap script that
+-- creates the official source distribution.

scripts/make_win_src_distribution.sh

@@ -289,9 +289,7 @@ cd $SOURCE
 for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\
          INSTALL-SOURCE INSTALL-WIN \
          INSTALL-WIN-SOURCE \
-         Docs/manual_toc.html  Docs/manual.html \
-         Docs/manual.txt Docs/mysqld_error.txt \
-         Docs/INSTALL-BINARY Docs/internals.texi
+         Docs/INSTALL-BINARY
 do
   print_debug "Copying file '$i'"
   if [ -f $i ]