Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  mysql.com:/home/kent/bk/bug25205/mysql-5.1-build

Docs/INSTALL-BINARY

+
+You can find information about how to install binary distributions at
+
+  http://dev.mysql.com/doc/refman/5.0/en/quick-standard-installation.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

Docs/Makefile.am

@@ -13,14 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-noinst_SCRIPTS =	generate-text-files.pl
-
-EXTRA_DIST =		$(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY
-
-TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE \
-			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
-
-all-local:		$(TXT_FILES)
+EXTRA_DIST =		mysql.info INSTALL-BINARY
 
 # make sure that "make install" installs the info page, too
 # automake only seems to take care of this automatically,
@@ -32,38 +25,5 @@ install-data-hook:	$(srcdir)/mysql.info
 uninstall-local:
 	@RM@ -f $(DESTDIR)$(infodir)/mysql.info
 
-# Problems with "make distclean", works differently for make files
-# generated by different versions of the automake. Some require the
-# generated files explicitly in DISTCLEANFILES.
-DISTCLEANFILES = $(TXT_FILES)
-
-# This target is not used in builds, just for convinience
-CLEAN_FILES:		$(TXT_FILES)
-	touch $(TXT_FILES)
-
-GT = $(srcdir)/generate-text-files.pl
-
-../INSTALL-SOURCE:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@
-
-../INSTALL-WIN-SOURCE:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@
-
-# We put the description for the binary installation here so that
-# people who download source wont have to see it. It is moved up to
-# the toplevel by the script that makes the binary tar files.
-INSTALL-BINARY:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@
-
-../support-files/MacOSX/ReadMe.txt:	$(srcdir)/mysql.info $(GT)
-	perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@
-
-# Include the Windows manual.chm in source .tar.gz only if available.
-# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.
-dist-hook:
-	if [ -e $(srcdir)/manual.chm ] ; then \
-	  cp -f $(srcdir)/manual.chm $(distdir); \
-	fi
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%

Docs/generate-text-files.pl

-#!/usr/bin/perl -w -*- perl -*-
-# Copyright (C) 2000, 2003, 2005 MySQL AB
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-# Generate text files from top directory from the manual.
-
-$from = shift(@ARGV);
-$fnode = shift(@ARGV);
-$tnode = shift(@ARGV);
-
-open(IN, "$from") || die "Cannot open $from: $!";
-
-$in = 0;
-
-while (<IN>)
-{
-  if ($in)
-  {
-    if (/Node: $tnode,/ || /\[index/)
-    {
-      $in = 0;
-    }
-    elsif (/^File: mysql.info/ || (/^/))
-    {
-      # Just Skip node beginnings
-    }
-    else
-    {
-      print;
-    }
-  }
-  else
-  {
-    if (/Node: $fnode,/)
-    {
-      $in = 1;
-      # Skip first empty line
-      <IN>;
-    }
-  }
-}
-
-close(IN);
-
-die "Could not find node \"$tnode\"" if ($in == 1);
-exit 0;

Docs/manual.chm

-
-*********************************************************
-
-This is a dummy placeholder file for "manual.chm" in the
-MySQL source trees.
-
-Note, that the documentation has been moved into a separate
-BitKeeper source tree named "mysqldoc" - do not attempt to edit this
-file! All changes to it should be done in the mysqldoc tree.
-
-This dummy file is being replaced with the actual file from the
-mysqldoc tree when building the official source distribution.
-
-*********************************************************

Docs/mysql.info

-This is mysql.info, produced by makeinfo version 4.8 from manual.texi.
 
-START-INFO-DIR-ENTRY
-* mysql: (mysql).               MySQL documentation.
-END-INFO-DIR-ENTRY
-
-
-File: mysql.info,  Node: Top,  Next: (dir),  Prev: (dir),  Up: (dir)
-
-This is an empty placeholder file for the MySQL manual.
-
-The MySQL manual is now maintained in a separate BitKeeper source tree!
-Please see `http://www.mysql.com/doc/en/Installing_source_tree.html'
-for more info on how to work with BitKeeper.
-
-This file will be replaced with the current `mysql.info' when building
-the official source distribution.
-
-You can find a specific manual for any older version of MySQL in the
-binary or source distribution for that version.
-
-
-
-Tag Table:
-Node: Top166
-
-End Tag Table
+The MySQL Reference Manual is available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

INSTALL-SOURCE

+
+You can find information about how to install from a source distributions at
+
+  http://dev.mysql.com/doc/refman/5.0/en/installing-source.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

INSTALL-WIN-SOURCE

+
+You can find information about how to install from a Windows source
+distributions at
+
+  http://dev.mysql.com/doc/refman/5.0/en/windows-source-build.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.

support-files/MacOSX/ReadMe.txt

+
+You can find information about how to install on Mac OS X at
+
+  http://dev.mysql.com/doc/refman/5.0/en/mac-os-x-installation.html
+
+The MySQL Reference Manual is also available in various formats on
+http://dev.mysql.com/doc; if you're interested in the DocBook XML
+sources go to http://svn.mysql.com.