# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1657277842 -7200
# Node ID cf5f46b2e0522bc0bafa44dccc8537b379c08af7
# Parent  65c4d98352d329b610328a9ae09a5c1a7d446b92
pkg: Replace OCTAVE_HOME in PREFIX and ARCHPREFIX independently (bug #62681).

* scripts/pkg/private/expand_rel_paths.m: The PREFIX and ARCHPREFIX might point
to directories outside OCTAVE_HOME independently. Also only replace "__OH__" if
it is at the start of the respective strings.

diff -r 65c4d98352d3 -r cf5f46b2e052 scripts/pkg/private/expand_rel_paths.m
--- a/scripts/pkg/private/expand_rel_paths.m	Fri Jul 08 12:46:37 2022 +0200
+++ b/scripts/pkg/private/expand_rel_paths.m	Fri Jul 08 12:57:22 2022 +0200
@@ -34,10 +34,9 @@
   loc = OCTAVE_HOME ();
   for i = 1:numel (pkg_list)
     ## Be sure to only prepend OCTAVE_HOME to pertinent package paths
-    if (strncmpi (pkg_list{i}.dir, "__OH__", 6))
-      pkg_list{i}.dir = [ loc pkg_list{i}.dir(7:end) ];
-      pkg_list{i}.archprefix = [ loc pkg_list{i}.archprefix(7:end) ];
-    endif
+    pkg_list{i}.dir = regexprep (pkg_list{i}.dir, "^__OH__", loc);
+    pkg_list{i}.archprefix = regexprep (pkg_list{i}.archprefix, ...
+                                        "^__OH__", loc);
   endfor
 
 endfunction