# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1657277874 -7200
# Node ID f8d3c0f035d05ec2ba6191cfcb56f1eee4eadcf8
# Parent  c4f52c6c5944310d4bf160c3ac746289261835c4# Parent  cf5f46b2e0522bc0bafa44dccc8537b379c08af7
maint: Merge stable to default.

diff -r c4f52c6c5944 -r f8d3c0f035d0 scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m	Thu Jul 07 22:07:04 2022 -0700
+++ b/scripts/pkg/pkg.m	Fri Jul 08 12:57:54 2022 +0200
@@ -600,6 +600,15 @@
             endfor
           endif
         endif
+
+        ## make sure the PREFIX and the ARCHPREFIX directories are created
+        if (! isfolder (prefix))
+          mkdir (prefix);
+        endif
+        if (! isfolder (archprefix))
+          mkdir (archprefix);
+        endif
+
         install (files, deps, prefix, archprefix, verbose, local_list,
                  global_list, global_install);
 
diff -r c4f52c6c5944 -r f8d3c0f035d0 scripts/pkg/private/expand_rel_paths.m
--- a/scripts/pkg/private/expand_rel_paths.m	Thu Jul 07 22:07:04 2022 -0700
+++ b/scripts/pkg/private/expand_rel_paths.m	Fri Jul 08 12:57:54 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