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

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

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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,

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -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,