Mercurial > octave
changeset 24946:7116fc02ef3a
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 21 Mar 2018 12:05:02 -0700 |
| parents | 13edbb760108 (current diff) ba9d37893822 (diff) |
| children | 371adf3760f9 |
| files | configure.ac |
| diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Mar 21 10:28:07 2018 -0700 +++ b/configure.ac Wed Mar 21 12:05:02 2018 -0700 @@ -2907,6 +2907,9 @@ fi AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) +AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS], + [test $ENABLE_DOCS = yes && test $build_qt_gui = yes]) + ### Determine whether Mercurial ID should be embedded in library binaries. ENABLE_HG_ID=yes
--- a/doc/interpreter/module.mk Wed Mar 21 10:28:07 2018 -0700 +++ b/doc/interpreter/module.mk Wed Mar 21 12:05:02 2018 -0700 @@ -192,16 +192,18 @@ OCTAVE_CSS = %reldir%/octave.css HTMLDIR_CSS = $(OCTAVE_HTML_DIR)/octave.css +$(srcdir)/%reldir%/octave.info: $(DOC_IMAGES_TXT) $(octave_TEXINFOS) +%reldir%/octave.dvi: $(DOC_IMAGES_EPS) $(octave_TEXINFOS) +%reldir%/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS) +$(OCTAVE_HTML_STAMP): $(DOC_IMAGES_PNG) $(octave_TEXINFOS) + +if AMCOND_BUILD_QT_DOCS + OCTAVE_QTHELP_FILES = %reldir%/octave_interpreter.qhc %reldir%/octave_interpreter.qch octdoc_DATA += \ $(OCTAVE_QTHELP_FILES) -$(srcdir)/%reldir%/octave.info: $(DOC_IMAGES_TXT) $(octave_TEXINFOS) -%reldir%/octave.dvi: $(DOC_IMAGES_EPS) $(octave_TEXINFOS) -%reldir%/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS) -$(OCTAVE_HTML_STAMP): $(DOC_IMAGES_PNG) $(octave_TEXINFOS) - $(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(srcdir)/%reldir%/mk_qthelp.pl $(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \ $(PERL) $(srcdir)/%reldir%/mk_qthelp.pl octave.html %reldir%/octave_interpreter && \ @@ -214,6 +216,8 @@ ## associated qch file, so that the files are built serially. %reldir%/octave_interpreter.qhc: %reldir%/octave_interpreter.qch +endif + $(srcdir)/%reldir%/octave.info: %reldir%/octave.texi $(srcdir)/%reldir%/version-octave.texi $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && $(am__cd) $(srcdir) && \