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

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

Docs/Makefile.am

@@ -19,14 +19,12 @@ 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 $(srcdir)/INSTALL-BINARY
+install-data-hook:	$(srcdir)/mysql.info
 	$(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
-	@RM@ -f $(DESTDIR)$(infodir)/INSTALL-BINARY
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%