diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 49d35dd0d6e..53100828a64 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -15,6 +15,8 @@ # Make "html" the default target, since that is what most people tend # to want to use. html: +# Note that all is *not* the default target in this directory +all: html man # We don't need the tree-wide headers or install support here. NO_GENERATED_HEADERS=yes @@ -25,8 +27,6 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -all: html man - ifndef DBTOEPUB DBTOEPUB = $(missing) dbtoepub diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index fd72b3975ad..b319621fdb8 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -442,7 +442,7 @@ LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=WARN To build just the HTML version of the documentation: -build$ ninja docs +build$ ninja html To build all forms of the documentation: diff --git a/doc/src/sgml/meson.build b/doc/src/sgml/meson.build index e5a38e060c7..dfdb1d0daa7 100644 --- a/doc/src/sgml/meson.build +++ b/doc/src/sgml/meson.build @@ -235,9 +235,9 @@ if docs_dep.found() alias_target('man', man) alias_target('install-man', install_doc_man) - # even though we don't want to build man pages as part of 'docs', we do want - # to install them as part of install-docs + # built and installed as part of the the docs target installdocs += install_doc_man + docs += man endif