From: Debian Octave Group <team+pkg-octave-team@tracker.debian.org>
Date: Thu, 25 Jul 2019 02:20:25 +0000 (+0100)
Subject: octave-pkgbuilddir
X-Git-Tag: archive/raspbian/4.4.1-6+rpi1~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a045aa5ad3476ba187d9e6cde4bd00d9ef8d3240;p=octave.git

octave-pkgbuilddir


Gbp-Pq: Name octave-pkgbuilddir.patch
---

diff --git a/scripts/pkg/private/install.m b/scripts/pkg/private/install.m
index 672b95d9..d54c5c7e 100644
--- a/scripts/pkg/private/install.m
+++ b/scripts/pkg/private/install.m
@@ -62,7 +62,10 @@ function install (files, handle_deps, prefix, archprefix, verbose,
     for i = 1:length (files)
       tgz = files{i};
 
-      if (exist (tgz, "file"))
+      ## The filename pointed to an uncompressed package to begin with.
+      if (exist (tgz, "dir"))
+        dirlist = {".", "..", tgz};
+      elseif (exist (tgz, "file"))
         ## Create a temporary directory.
         tmpdir = tempname ();
         tmpdirs{end+1} = tmpdir;
@@ -91,17 +94,16 @@ function install (files, handle_deps, prefix, archprefix, verbose,
         endif
       endif
 
-      ## The filename pointed to an uncompressed package to begin with.
-      if (exist (tgz, "dir"))
-        dirlist = {".", "..", tgz};
-      endif
-
-      if (exist (tgz, "file") || exist (tgz, "dir"))
+      if (exist (tgz, "file"))
         ## The two first entries of dirlist are "." and "..".
-        if (exist (tgz, "file"))
-          packdir = fullfile (tmpdir, dirlist{3});
+        if (exist (tgz, "dir"))
+          if (tgz(1) == '/')
+            packdir = tgz;
+          else
+            packdir = fullfile (pwd (), dirlist{3});
+          endif
         else
-          packdir = fullfile (pwd (), dirlist{3});
+          packdir = fullfile (tmpdir, dirlist{3});
         endif
         packdirs{end+1} = packdir;