Mercurial > octave-dspies

changeset 18709:a18e223224c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix pkg install -global (bug #41644) * scripts/pkg/private/default_prefix.m (default_prefix): Add optional second input argument 'desc' * scripts/pkg/private/getarchprefix.m (getarchprefix): Call 'default_prefix' with 'desc' as second parameter
author Stefan Mahr <dac922@gmx.de>
date Sun, 16 Mar 2014 13:19:25 +0100
parents ec55f6870efb
children d57a83f2d73e
files scripts/pkg/private/default_prefix.m scripts/pkg/private/getarchprefix.m
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/pkg/private/default_prefix.m	Wed Apr 30 08:24:08 2014 -0700
+++ b/scripts/pkg/private/default_prefix.m	Sun Mar 16 13:19:25 2014 +0100
@@ -22,11 +22,16 @@
 ## Undocumented internal function.
 ## @end deftypefn
 
-function [prefix, archprefix] = default_prefix (global_install)
+function [prefix, archprefix] = default_prefix (global_install, desc)
   if (global_install)
     prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
-    archprefix = fullfile (octave_config_info ("libdir"), "octave",
-                           "packages", [desc.name "-" desc.version]);
+    if (nargin == 2)
+      archprefix = fullfile (octave_config_info ("libdir"), "octave",
+                             "packages", [desc.name "-" desc.version]);
+    else
+      archprefix = fullfile (octave_config_info ("libdir"), "octave",
+                             "packages");
+    endif
   else
     prefix = tilde_expand (fullfile ("~", "octave"));
     archprefix = prefix;
--- a/scripts/pkg/private/getarchprefix.m	Wed Apr 30 08:24:08 2014 -0700
+++ b/scripts/pkg/private/getarchprefix.m	Sun Mar 16 13:19:25 2014 +0100
@@ -24,7 +24,7 @@
 
 function archprefix = getarchprefix (desc, global_install)
   if (global_install)
-    [~, archprefix] = default_prefix (global_install);
+    [~, archprefix] = default_prefix (global_install, desc);
   else
     archprefix = desc.dir;
   endif