Mercurial > octave
diff scripts/pkg/pkg.m @ 12710:762d10c77277 stable
maint: use libdir for .oct files, not libexecdir
From Orion Poplawski <orion@cora.nwra.com>.
* configure.ac (octlibdir): Use octave/$(version), not
octave-$(version).
(octfiledir): Use $(libdir), not $(libexecdir).
(localoctfiledir): Likewise.
(localapioctfiledir): Likewise.
(localveroctfiledir): Likewise.
* pkg.m: Use libdir instead of libexecdir as needed.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 06 Jun 2011 11:54:15 -0400 |
| parents | f96b9b9f141b |
| children | 0ca5672d5f1a |
line wrap: on
line diff
--- a/scripts/pkg/pkg.m Thu Jun 02 17:44:51 2011 -0400 +++ b/scripts/pkg/pkg.m Mon Jun 06 11:54:15 2011 -0400 @@ -255,7 +255,7 @@ if (prefix == -1) if (global_install) prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); - archprefix = fullfile (octave_config_info ("libexecdir"), + archprefix = fullfile (octave_config_info ("libdir"), "octave", "packages"); else prefix = fullfile ("~", "octave"); @@ -300,7 +300,7 @@ global_install = true; if (! user_prefix) prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); - archprefix = fullfile (octave_config_info ("libexecdir"), + archprefix = fullfile (octave_config_info ("libdir"), "octave", "packages"); endif case available_actions @@ -2219,14 +2219,14 @@ endfunction function arch = getarch () - persistent _arch = cstrcat (octave_config_info("canonical_host_type"), ... - "-", octave_config_info("api_version")); + persistent _arch = cstrcat (octave_config_info ("canonical_host_type"), + "-", octave_config_info ("api_version")); arch = _arch; endfunction function archprefix = getarchprefix (desc, global_install) if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) - archprefix = fullfile (octave_config_info ("libexecdir"), "octave", + archprefix = fullfile (octave_config_info ("libdir"), "octave", "packages", cstrcat(desc.name, "-", desc.version)); else archprefix = desc.dir;