From aaefcc767d56504e6e6a1f2063a5ec2de2d672be Mon Sep 17 00:00:00 2001 From: Debian Octave Group Date: Fri, 1 Mar 2019 09:16:21 +0000 Subject: [PATCH] octave-pkgbuilddir Gbp-Pq: Name octave-pkgbuilddir.patch --- scripts/pkg/private/install.m | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) 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; -- 2.30.2