Commit d99dd9c7 authored by Michele Tartara's avatar Michele Tartara

Fix documentation building rules

Implement the correct behavior to be kept when sphinx-build is not installed.
It was already correctly checked, but instead of just disabling the
documentation generation, an error message was printed, having "make" fail.
Signed-off-by: default avatarMichele Tartara <mtartara@google.com>
Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
parent f06af3ca
...@@ -745,14 +745,17 @@ endif ...@@ -745,14 +745,17 @@ endif
# Things to build but not to install (add it to EXTRA_DIST if it should be # Things to build but not to install (add it to EXTRA_DIST if it should be
# distributed) # distributed)
noinst_DATA = \ noinst_DATA = \
doc/html \
$(BUILT_EXAMPLES) \ $(BUILT_EXAMPLES) \
doc/examples/bash_completion \ doc/examples/bash_completion \
doc/examples/bash_completion-debug \ doc/examples/bash_completion-debug \
$(manhtml) $(manhtml)
if HAS_SPHINX
if MANPAGES_IN_DOC if MANPAGES_IN_DOC
noinst_DATA += doc/man-html noinst_DATA += doc/man-html
else
noinst_DATA += doc/html
endif
endif endif
gnt_scripts = \ gnt_scripts = \
......
...@@ -408,6 +408,7 @@ else ...@@ -408,6 +408,7 @@ else
AC_MSG_ERROR([Sphinx 1.0 or higher is required]) AC_MSG_ERROR([Sphinx 1.0 or higher is required])
fi fi
fi fi
AM_CONDITIONAL([HAS_SPHINX], [test -n "$SPHINX"])
AC_ARG_ENABLE([manpages-in-doc], AC_ARG_ENABLE([manpages-in-doc],
[AS_HELP_STRING([--enable-manpages-in-doc], [AS_HELP_STRING([--enable-manpages-in-doc],
......
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