Mercurial > octave
changeset 21128:61ca546e1942
improve handling of --disable-docs
* doc/module.mk (INFO_DEPS, DVIS, PDFS, PSS, HTMLS):
Define conditionally.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 21 Jan 2016 13:03:27 -0500 |
parents | df7891224709 |
children | 228b65504557 |
files | doc/module.mk |
diffstat | 1 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/module.mk Thu Jan 21 09:47:50 2016 -0800 +++ b/doc/module.mk Thu Jan 21 13:03:27 2016 -0500 @@ -28,6 +28,16 @@ am__v_PDFTEX_0 = @echo " PDFTEX " $@; am__v_PDFTEX_1 = +## Conditionally define the following variables so that --disable-docs +## can work. If we don't define them, Automake will always define them, +## even when AMCOND_BUILD_DOCS is false. + +INFO_DEPS = +DVIS = +PDFS = +PSS = +HTMLS = + if AMCOND_BUILD_DOCS ## Listing "dvi" explicitly here seems to cause two simultaneous @@ -235,6 +245,12 @@ octave_TEXINFOS = \ $(BUILT_OCTAVE_TEXI_SRC) +INFO_DEPS += $(srcdir)/doc/interpreter/octave.info +DVIS += doc/interpreter/octave.dvi +PDFS += doc/interpreter/octave.pdf +PSS += doc/interpreter/octave.ps +HTMLS += doc/interpreter/octave.html + ## As of version 1.14.1, automake does not seem to generate ## rules for DVI, PDF, or HTML output that work for us when ## there are additional dependencies, so we include our own @@ -433,6 +449,12 @@ info_TEXINFOS += \ doc/liboctave/liboctave.texi +INFO_DEPS += $(srcdir)/doc/liboctave/liboctave.info +DVIS += doc/liboctave/liboctave.dvi +PDFS += doc/liboctave/liboctave.pdf +PSS += doc/liboctave/liboctave.ps +HTMLS += doc/liboctave/liboctave.html + doc/liboctave/liboctave.dvi: doc/liboctave/liboctave.texi $(srcdir)/doc/liboctave/version-liboctave.texi | doc/liboctave/$(am__dirstamp) $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/liboctave -I $(srcdir)/doc/liboctave' \