summaryrefslogtreecommitdiff
path: root/Build-tools
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2004-11-04 11:18:12 +0100
committerunknown <joerg@mysql.com>2004-11-04 11:18:12 +0100
commit0dd1ab1abbf81fef1ab9ebf43a06a1b0d0129487 (patch)
treefeea390d2e2778a9d15017e7835031bc95356d31 /Build-tools
parente823c99731d37a682030c02d06dc47a178717d5b (diff)
downloadmariadb-git-0dd1ab1abbf81fef1ab9ebf43a06a1b0d0129487.tar.gz
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".
Diffstat (limited to 'Build-tools')
-rwxr-xr-xBuild-tools/Bootstrap4
1 files changed, 4 insertions, 0 deletions
diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index 8cad093bc5f..e21179fe78c 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -288,6 +288,10 @@ unless ($opt_skip_manual)
system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0
or &abort("Could not update $file.texi in $target_dir/Docs/!");
}
+ system ("rm $target_dir/Docs/Images/Makefile*") == 0
+ or &abort("Could not remove Makefiles in $target_dir/Docs/Images/!");
+ system ("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images") == 0
+ or &abort("Could not copy image files in $target_dir/Docs/Images/!");
}
#