summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2004-11-04 11:18:12 +0100
committerjoerg@mysql.com <>2004-11-04 11:18:12 +0100
commitcb0bd6f57d87ad2bc3691a9dce013ce7e9419cd7 (patch)
treefeea390d2e2778a9d15017e7835031bc95356d31 /Docs
parent10291f36647dfdf072db440c14a4faa5d072a371 (diff)
downloadmariadb-git-cb0bd6f57d87ad2bc3691a9dce013ce7e9419cd7.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.
Diffstat (limited to 'Docs')
-rw-r--r--Docs/Images/Makefile.am35
-rw-r--r--Docs/Makefile.am2
2 files changed, 37 insertions, 0 deletions
diff --git a/Docs/Images/Makefile.am b/Docs/Images/Makefile.am
new file mode 100644
index 00000000000..b57d701d8a0
--- /dev/null
+++ b/Docs/Images/Makefile.am
@@ -0,0 +1,35 @@
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
+
+## Process this file with automake to create Makefile.in
+
+# This is a dummy file to satisfy the hierarchy of Makefiles.
+# When a release is built, the true Makefile will be copied
+# together with the "real" files in this directory.
+
+EXTRA_DIST =
+
+# Nothing to create in this dummy directory.
+all:
+ :
+
+# Nothing to cleanup in this dummy directory.
+clean:
+ :
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index a4e8e14a38d..e53ea195d94 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -24,6 +24,8 @@ BUILT_SOURCES = $(targets) manual_toc.html include.texi
EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
INSTALL-BINARY reservedwords.texi
+SUBDIRS = Images
+
all: $(targets) txt_files
txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \