bk commit into 4.0 tree (lenz:1.2091)

[lenz]

Below is the list of changes that have just been committed into a local
4.0 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2091 05/04/19 13:33:38 lenz@stripped +1 -0
  Updated Docs/Makefile.am:
  
  - fixed copyright header and removed obsolete comments about how to
    build the manual using texinfo
  - added an "install-data-hook" to install the mysql.info info page.
    This seems to be the only way to install info pages, if they are not
    built from texinfo sources directly.

  Docs/Makefile.am
    1.53 05/04/19 13:33:34 lenz@stripped +22 -10
    - fixed copyright header and removed obsolete comments about how to
      build the manual using texinfo
    - added an "install-data-hook" to install the mysql.info info page.
      This seems to be the only way to install info pages, if they are not
      built from texinfo sources directly.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.0-build

--- 1.52/Docs/Makefile.am	2005-04-19 11:15:33 +02:00
+++ 1.53/Docs/Makefile.am	2005-04-19 13:33:34 +02:00
@@ -1,13 +1,18 @@
-# Normally you do not need to remake the files here. But if you want
-# to you will need the GNU TeX-info utilities. To make a Postscript
-# files you also need TeX and dvips. To make the PDF file you will
-# need pdftex. We use the teTeX distribution for all of these.
-
-# We avoid default automake rules because of problems with .dvi file
-# and BSD makes
-
-# If you know how to fix any of this more elegantly please mail
-# docs@stripped
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 noinst_SCRIPTS =	Support/generate-text-files.pl
 
@@ -17,6 +22,13 @@
 
 txt_files:		../INSTALL-SOURCE ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+
+# 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:	mysql.info
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
 
 CLEAN_FILES:		$(txt_files)
 	touch $(txt_files)