Mercurial > octave
changeset 24889:92aaa85c06b8 stable
build: use normal automake syntax for installing Qt help (bug #53006)
* Makefile.am (octdoc_DATA): Initialize to empty.
(install-data-local): No longer depend on doc-interpreter-install-doc-local.
* doc/interpreter/module.mk (octdoc_DATA): Include $(OCTAVE_QTHELP_FILES).
(doc-interpreter-install-doc-local): Delete.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 14 Mar 2018 17:58:27 -0700 |
| parents | bdecc7465840 |
| children | d664734ce8eb |
| files | Makefile.am doc/interpreter/module.mk |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Mar 14 16:47:00 2018 -0700 +++ b/Makefile.am Wed Mar 14 17:58:27 2018 -0700 @@ -97,6 +97,7 @@ image_DATA = octdata_DATA = +octdoc_DATA = octetc_DATA = octlocale_DATA = @@ -399,7 +400,7 @@ installdirs-local: $(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) -install-data-local: installdirs-local doc-interpreter-install-doc-local +install-data-local: installdirs-local clean-local: doc-clean
--- a/doc/interpreter/module.mk Wed Mar 14 16:47:00 2018 -0700 +++ b/doc/interpreter/module.mk Wed Mar 14 17:58:27 2018 -0700 @@ -194,6 +194,9 @@ 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) @@ -301,10 +304,6 @@ $(MUNGED_TEXI_SRC): $(DOCSTRING_FILES) -doc-interpreter-install-doc-local: - $(MKDIR_P) $(octdocdir) - cp $(OCTAVE_QTHELP_FILES) $(octdocdir) - ## These two texi files have an additional dependency through the ## @EXAMPLEFILE macro. %reldir%/oop.texi: $(examples_code_SRC)