Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0

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

4 files changed, 15 insertions, 99 deletions

diff --git a/Docs/INSTALL-BINARY b/Docs/INSTALL-BINARY
new file mode 100644
index 00000000000..54d10028dc3
--- /dev/null
+++ b/Docs/INSTALL-BINARY
@@ -0,0 +1,8 @@
+
+You can find information about how to install binary distributions at
+
+  http://dev.mysql.com/doc/refman/4.1/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.
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index ab4288ba9d9..02702d77fed 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -14,45 +14,19 @@
 # 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 =	Support/generate-text-files.pl
-
-EXTRA_DIST =		$(noinst_SCRIPTS) 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,
 # if we're building the info page from texi directly.
-install-data-hook:	$(srcdir)/mysql.info
+install-data-hook:	$(srcdir)/mysql.info $(srcdir)/INSTALL-BINARY
 	$(mkinstalldirs) $(DESTDIR)$(infodir)
 	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
+	$(INSTALL_DATA) $(srcdir)/INSTALL-BINARY $(DESTDIR)$(infodir)
 
 uninstall-local:
 	@RM@ -f $(DESTDIR)$(infodir)/mysql.info
-
-# This target is not used in builds, just for convinience
-CLEAN_FILES:		$(TXT_FILES)
-	touch $(TXT_FILES)
-
-GT = $(srcdir)/Support/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" > $@
+	@RM@ -f $(DESTDIR)$(infodir)/INSTALL-BINARY
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/Docs/Support/generate-text-files.pl b/Docs/Support/generate-text-files.pl
deleted file mode 100755
index 0829525f679..00000000000
--- a/Docs/Support/generate-text-files.pl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl -w -*- perl -*-
-# 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;
diff --git a/Docs/mysql.info b/Docs/mysql.info
index 5846d7aadf6..b2c411e51ab 100644
--- a/Docs/mysql.info
+++ b/Docs/mysql.info
@@ -1,27 +1,4 @@
-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.