Mercurial > octave
changeset 28880:68e6e6f083f3 stable
doc: Correct some installation paths (bug #59236).
* doc/interpreter/func.txi,
libinterp/corefcn/fcn-info.cc (ignore_function_time_stamp): Correct path to
installed .m files.
* doc/interpreter/install.txi: Correct path to installed headers.
* libinterp/corefcn/help.cc (Finfo_file): Correct default info file location.
(Finfo_program): Correct default value.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 09 Oct 2020 15:06:55 +0200 |
| parents | be626701204c |
| children | 5ee60b512cb8 d7169f012ee1 |
| files | doc/interpreter/func.txi doc/interpreter/install.txi libinterp/corefcn/fcn-info.cc libinterp/corefcn/help.cc |
| diffstat | 4 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/func.txi Fri Oct 09 13:43:42 2020 +0200 +++ b/doc/interpreter/func.txi Fri Oct 09 15:06:55 2020 +0200 @@ -1949,7 +1949,7 @@ Many of Octave's standard functions are distributed as function files. They are loosely organized by topic, in subdirectories of -@file{@var{octave-home}/lib/octave/@var{version}/m}, to make it easier +@file{@var{octave-home}/share/octave/@var{version}/m}, to make it easier to find them. The following is a list of all the function file subdirectories, and the
--- a/doc/interpreter/install.txi Fri Oct 09 13:43:42 2020 +0200 +++ b/doc/interpreter/install.txi Fri Oct 09 15:06:55 2020 +0200 @@ -595,7 +595,7 @@ @item @var{prefix}/lib/octave-@var{version} Libraries like liboctave.a and liboctinterp.a. -@item @var{prefix}/octave-@var{version}/include/octave +@item @var{prefix}/include/octave-@var{version}/octave Include files distributed with Octave. @item @var{prefix}/share
--- a/libinterp/corefcn/fcn-info.cc Fri Oct 09 13:43:42 2020 +0200 +++ b/libinterp/corefcn/fcn-info.cc Fri Oct 09 15:06:55 2020 +0200 @@ -1118,13 +1118,16 @@ If the internal variable is set to @qcode{"system"}, Octave will not automatically recompile function files in subdirectories of -@file{@var{octave-home}/lib/@var{version}} if they have changed since they were last compiled, but will recompile other function files in the search path if they change. +@file{@var{octave-home}/share/@var{version}/m} if they have changed since +they were last compiled, but will recompile other function files in the +search path if they change. If set to @qcode{"all"}, Octave will not recompile any function files unless their definitions are removed with @code{clear}. -If set to @qcode{"none"}, Octave will always check time stamps on files to -determine whether functions defined in function files need to recompiled. +If set to @qcode{"none"}, Octave will always check time stamps on files +to determine whether functions defined in function files need to +recompiled. @end deftypefn */) { int nargin = args.length ();
--- a/libinterp/corefcn/help.cc Fri Oct 09 13:43:42 2020 +0200 +++ b/libinterp/corefcn/help.cc Fri Oct 09 15:06:55 2020 +0200 @@ -1005,7 +1005,7 @@ Octave info file. The default value is -@file{@var{octave-home}/info/octave.info}, in +@file{@var{octave-home}/share/info/octave.info}, in which @var{octave-home} is the root directory of the Octave installation. The default value may be overridden by the environment variable @w{@env{OCTAVE_INFO_FILE}}, or the command line argument @@ -1030,14 +1030,9 @@ Query or set the internal variable that specifies the name of the info program to run. -The default value is -@file{@var{octave-home}/libexec/octave/@var{version}/exec/@var{arch}/info} -in which @var{octave-home} is the root directory of the Octave installation, -@var{version} is the Octave version number, and @var{arch} is the system -type (for example, @code{i686-pc-linux-gnu}). The default value may be -overridden by the environment variable -@w{@env{OCTAVE_INFO_PROGRAM}}, or the command line argument -@option{--info-program NAME}. +The default value is "@file{info}". The default value may be overridden by the +environment variable @w{@env{OCTAVE_INFO_PROGRAM}}, or the command line +argument @option{--info-program NAME}. When called from inside a function with the @qcode{"local"} option, the variable is changed locally for the function and any subroutines it calls.