Mercurial > octave-nkf
changeset 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 | 96180026afc5 |
| children | f66dacbeb7be 89638f2b844a |
| files | configure.ac scripts/pkg/pkg.m |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Jun 02 17:44:51 2011 -0400 +++ b/configure.ac Mon Jun 06 11:54:15 2011 -0400 @@ -125,7 +125,7 @@ '$(datadir)/octave/site/$(api_version)/m') OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m') OCTAVE_SET_DEFAULT(octetcdir, '$(datadir)/octave/$(version)/etc') -OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave-$(version)') +OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave/$(version)') OCTAVE_SET_DEFAULT(archlibdir, '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localarchlibdir, @@ -135,13 +135,13 @@ OCTAVE_SET_DEFAULT(localverarchlibdir, '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)') OCTAVE_SET_DEFAULT(octfiledir, - '$(libexecdir)/octave/$(version)/oct/$(canonical_host_type)') + '$(libdir)/octave/$(version)/oct/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localoctfiledir, - '$(libexecdir)/octave/site/oct/$(canonical_host_type)') + '$(libdir)/octave/site/oct/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localapioctfiledir, - '$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') + '$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localveroctfiledir, - '$(libexecdir)/octave/$(version)/site/oct/$(canonical_host_type)') + '$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)') OCTAVE_SET_DEFAULT(imagedir, '$(datadir)/octave/$(version)/imagelib') ### Find pkg-config executable (sets $PKG_CONFIG)
--- 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;