summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
Diffstat (limited to 'Docs')
-rw-r--r--Docs/Makefile.am7
-rw-r--r--Docs/reservedwords.texi14
2 files changed, 16 insertions, 5 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 17def904875..78aaadd4dd5 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -16,7 +16,7 @@ TEXINFO_TEX = Support/texinfo.tex
noinst_SCRIPTS = Support/texi2html Support/generate-text-files.pl \
Support/generate-mirror-listing.pl
-info_TEXINFOS = manual.texi
+info_TEXINFOS = manual.texi reservedwords.texi
targets = manual.txt mysql.info manual.html
@@ -26,7 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt INSTALL-BINARY
all: $(targets) txt_files
txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
- ../MIRRORS INSTALL-BINARY
+ INSTALL-BINARY
CLEAN_FILES: $(BUILD_SOURCES)
touch $(BUILD_SOURCES)
@@ -145,8 +145,5 @@ INSTALL-BINARY: mysql.info $(GT)
../COPYING.LIB: mysql.info $(GT)
perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
-../MIRRORS: manual.texi $(srcdir)/Support/generate-mirror-listing.pl
- perl -w $(srcdir)/Support/generate-mirror-listing.pl manual.texi > $@
-
# Don't update the files from bitkeeper
%::SCCS/s.%
diff --git a/Docs/reservedwords.texi b/Docs/reservedwords.texi
new file mode 100644
index 00000000000..a6dddfe9a7a
--- /dev/null
+++ b/Docs/reservedwords.texi
@@ -0,0 +1,14 @@
+@c This is a placeholder file for the autogenerated MySQL reserved
+@c word list "reservedwords.texi", which is being included in
+@c manual.texi when building the manual.
+@c
+@c This file will be replaced with the actual reserved word list
+@c from the "mysqldoc" BK source tree when building the official
+@c source distribution.
+@c
+@c Please note, that the manual is now maintained in a separate
+@c "mysqldoc" BitKeeper tree! See
+@c
+@c http://www.mysql.com/doc/en/Installing_source_tree.html
+@c
+@c for more info on how to work with the MySQL BK source trees.