From dd9822a9b9799e0fb22a89d8dc46a4f5b1b5e538 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafael=20Laboissi=C3=A8re?= Date: Tue, 4 Feb 2020 12:05:00 +0000 Subject: [PATCH] Allow an unpacked source package to be compiled in place Origin: vendor, http://pkgs.fedoraproject.org/cgit/rpms/octave.git/tree/octave-pkgbuilddir.patch Forwarded: not-needed Last-Update: 2016-02-13 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 ef8131ed..8fd3dc13 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 (isfolder (tgz)) + dirlist = {".", "..", tgz}; + elseif (exist (tgz, "file")) ## Create a temporary directory. tmpdir = tempname (); tmpdirs{end+1} = tmpdir; @@ -97,17 +100,16 @@ function install (files, handle_deps, prefix, archprefix, verbose, endif endif - ## The filename pointed to an uncompressed package to begin with. - if (isfolder (tgz)) - dirlist = {".", "..", tgz}; - endif - - if (exist (tgz, "file") || isfolder (tgz)) + 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