Mercurial > hg > octave-lyh
changeset 6246:b317fc1b21cc
[project @ 2007-01-19 03:14:42 by jwe]
author | jwe |
---|---|
date | Fri, 19 Jan 2007 03:14:42 +0000 |
parents | e154732e00b7 |
children | 7b04118f04df |
files | scripts/ChangeLog scripts/pkg/pkg.m |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,6 +1,7 @@ 2007-01-18 Søren Hauberg <hauberg@gmail.com> * pkg/pkg.m (create_pkgadddel): Call fullfile with nm, not "nm". + (configure_make): Use fullfile instead of concatenating with "/". 2007-01-10 Baylis Shanks <bshanks3@hotmail.com>
--- a/scripts/pkg/pkg.m +++ b/scripts/pkg/pkg.m @@ -592,8 +592,8 @@ function configure_make (desc, packdir) ## Perform ./configure, make, make install in "src" - if (exist([packdir "src"], "dir")) - src = [packdir "src/"]; + if (exist(fullfile(packdir, "src"), "dir")) + src = fullfile(packdir, "src"); ## configure if (exist(fullfile(src, "configure"), "file")) [status, output] = system(["cd " src " ;./configure --prefix=" desc.dir]); @@ -640,12 +640,13 @@ oct = dir(fullfile(src, "*.oct")); filenames = ""; if (length(m) > 0) - filenames = sprintf([src "%s "], m.name); + filenames = sprintf(fullfile(src, "%s "), m.name); endif if (length(oct) > 0) - filenames = [filenames " " sprintf([src "%s "], oct.name)]; + filenames = [filenames " " sprintf(fullfile(src, "%s "), oct.name)]; endif endif + filenames = split_by(filenames, " "); if (!all(isspace(filenames))) mkdir(instdir);