From c6f0c29acbd77a6b12f58775a68701913b3ce094 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 22 Nov 2007 17:48:40 +0100 Subject: [PATCH] Makefile.am, configure.in: Include "manual.chm" in source TAR if it exists configure.in: Include "manual.chm" in source TAR if it exists Docs/Makefile.am: Include "manual.chm" in source TAR if it exists --- Docs/Makefile.am | 2 +- configure.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Makefile.am b/Docs/Makefile.am index dac256f8fd6..629618609a3 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -13,7 +13,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -EXTRA_DIST = mysql.info INSTALL-BINARY +EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@ # make sure that "make install" installs the info page, too # automake only seems to take care of this automatically, diff --git a/configure.in b/configure.in index e042bb80719..ead2f85afb7 100644 --- a/configure.in +++ b/configure.in @@ -2452,10 +2452,15 @@ AC_ARG_WITH(docs, if test "$with_docs" = "yes" then docs_dirs="Docs" + if test -f "$srcdir/Docs/manual.chm" ; then + extra_docs="manual.chm" + fi else docs_dirs="" + extra_docs="" fi AC_SUBST(docs_dirs) +AC_SUBST(extra_docs) # Shall we build the man pages? AC_ARG_WITH(man,