diff options
author | unknown <kent@kent-amd64.(none)> | 2007-11-22 17:53:47 +0100 |
---|---|---|
committer | unknown <kent@kent-amd64.(none)> | 2007-11-22 17:53:47 +0100 |
commit | 560f4d5260e2782673879b5c5ab710b0c03dee2c (patch) | |
tree | ec19998866facd832b0113146c70f15ddc04438a /Docs | |
parent | 028061ea4bd5280105c02e58d85fa2f47fe7b218 (diff) | |
parent | c6f0c29acbd77a6b12f58775a68701913b3ce094 (diff) | |
download | mariadb-git-560f4d5260e2782673879b5c5ab710b0c03dee2c.tar.gz |
Merge mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
Docs/Makefile.am:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'Docs')
-rw-r--r-- | Docs/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index dac256f8fd6..629618609a3 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -13,7 +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 -EXTRA_DIST = mysql.info INSTALL-BINARY +EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@ # make sure that "make install" installs the info page, too # automake only seems to take care of this automatically, |