Merge trift2.:/MySQL/M50/extract1-5.0

into trift2.:/MySQL/M50/push-5.0

Merge trift2.:/MySQL/M50/extract1-5.0
into trift2.:/MySQL/M50/push-5.0
3acb6778 · joerg@trift2 · cf9d1c91 · a33fdb44 · 3acb6778 · 3acb6778
Commit 3acb6778 authored Sep 21, 2006 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Docs/Makefile.am Docs/Makefile.am +1 -1

configure.in configure.in +1 -0

No files found.
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -16,7 +16,7 @@
 noinst_SCRIPTS =	Support/generate-text-files.pl
-EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY
+EXTRA_DIST =		$(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY
 TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

--- a/configure.in
+++ b/configure.in
@@ -1216,6 +1216,7 @@ EOF
    #
    echo -n "making sure specific build files are writable... "
    for file in \
+        Docs/manual.chm \
        Docs/mysql.info \
        Docs/INSTALL-BINARY \
        INSTALL-SOURCE \