The files stored in "Docs/Images" within the "mysqldocs" BK tree must be included

in the source tar-ball for distribution. This is done by using the "DISTFILES" macro
in a new "Docs/Images/Makefile". As the source BK tree does not contain these files,
they are copied from the "mysqldocs" tree at release build time.
This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today.


Build-tools/Bootstrap:
  Copy the relevant files with "Docs/Images" from the "mysqldocs" BK tree into the
  build tree, ensuring that the "Makefile*" from the source BK tree are removed before.
Docs/Images/Makefile.am:
  This dummy file is only needed to satisfy the Makefile hierarchy, 
  at release build time it will be replaced by its counterpart from the "mysqldocs" BK tree.
Docs/Makefile.am:
  Include the new "Docs/Images/Makefile" in the Makefile hierarchy.
configure.in:
  Ensure that the autotools will handle the new "Docs/Images/Makefile.am".

1 files changed, 1 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index d4ede468435..0c520ca8980 100644
--- a/configure.in
+++ b/configure.in
@@ -2711,7 +2711,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
  pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
  merge/Makefile dbug/Makefile scripts/Makefile dnl
  include/Makefile sql-bench/Makefile tools/Makefile dnl
- tests/Makefile Docs/Makefile support-files/Makefile dnl
+ tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
  netware/Makefile dnl
  include/mysql_version.h dnl