Skip to content

M
mariadb
Commit 99c4a164 authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)
Browse files
Options

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
parents 9d898103 41778b56
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
Docs/Makefile.am
View file @ 99c4a164
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 # make sure that "make install" installs the info page, too
# automake only seems to take care of this automatically, # automake only seems to take care of this automatically,
......
configure.in
View file @ 99c4a164
...@@ -2452,10 +2452,15 @@ AC_ARG_WITH(docs, ...@@ -2452,10 +2452,15 @@ AC_ARG_WITH(docs,
if test "$with_docs" = "yes" if test "$with_docs" = "yes"
then then
docs_dirs="Docs" docs_dirs="Docs"
if test -f "$srcdir/Docs/manual.chm" ; then
extra_docs="manual.chm"
fi
else else
docs_dirs="" docs_dirs=""
extra_docs=""
fi fi
AC_SUBST(docs_dirs) AC_SUBST(docs_dirs)
AC_SUBST(extra_docs)
# Shall we build the man pages? # Shall we build the man pages?
AC_ARG_WITH(man, AC_ARG_WITH(man,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7