Mercurial > octave
diff src/octave-config.in.cc @ 24875:7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
* prepare_qhelp.py: New python script to prepare XML qcollectiongenerator files
* configure.ac: Display the output of detected qcollectiongenerator
* m4/acinclude.m4: Detect qcollectiongenerator alongside with other QT tools.
* doc/interpreter/module.mk: Add rules to build octave_interpreter.qhc and .qch
and install them in "octdocdir"
* run-octave.in: export OCTAVE_QTHELP_COLLECTION to access collection file and
compressed help.
* Makefile.am: add doc-interpreter-install-doc-local to install-data-local
prerequisites
* build-aux/subst-default-vals.in.sh, libinterp/corefcn/default-defs.in.h, libinterp/corefcn/defaults.cc/h, src/octave-config.in.cc: copy "octdatadir" handling
for "octdocdir".
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Mon, 12 Feb 2018 23:53:16 +0100 |
| parents | 194eb4bd202b |
| children | 1a46d174a483 |
line wrap: on
line diff
--- a/src/octave-config.in.cc Wed Mar 14 14:29:50 2018 +0100 +++ b/src/octave-config.in.cc Mon Feb 12 23:53:16 2018 +0100 @@ -77,12 +77,12 @@ " IMAGEDIR OCTAVE_EXEC_HOME\n" " INCLUDEDIR OCTAVE_HOME\n" " INFODIR OCTDATADIR\n" -" INFOFILE OCTFILEDIR\n" -" LIBDIR OCTINCLUDEDIR\n" -" LIBEXECDIR OCTLIBDIR\n" -" LOCALAPIARCHLIBDIR STARTUPFILEDIR\n" -" LOCALAPIFCNFILEDIR VERSION\n" -" LOCALAPIOCTFILEDIR\n" +" INFOFILE OCTDOCDIR\n" +" LIBDIR OCTFILEDIR\n" +" LIBEXECDIR OCTINCLUDEDIR\n" +" LOCALAPIARCHLIBDIR OCTLIBDIR\n" +" LOCALAPIFCNFILEDIR STARTUPFILEDIR\n" +" LOCALAPIOCTFILEDIR VERSION\n" "\n" " -v, --version Print the Octave version number.\n" "\n"; @@ -126,6 +126,7 @@ vars["MAN1DIR"] = prepend_octave_home (%OCTAVE_MAN1DIR%); vars["MANDIR"] = prepend_octave_home (%OCTAVE_MANDIR%); vars["OCTDATADIR"] = prepend_octave_home (%OCTAVE_OCTDATADIR%); + vars["OCTDOCDIR"] = prepend_octave_home (%OCTAVE_OCTDOCDIR%); vars["OCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_OCTFILEDIR%); vars["OCTINCLUDEDIR"] = prepend_octave_home (%OCTAVE_OCTINCLUDEDIR%); vars["OCTLIBDIR"] = prepend_octave_exec_home (%OCTAVE_OCTLIBDIR%);