Mercurial > hg > octave-lyh
changeset 5976:b1a1c10bf2fd
[project @ 2006-08-30 20:02:52 by dbateman]
author | dbateman |
---|---|
date | Wed, 30 Aug 2006 20:02:52 +0000 |
parents | e64059303a6f |
children | 27dd5b29489b |
files | scripts/ChangeLog scripts/pkg/pkg.m |
diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2006-08-30 David Bateman <dbateman@free.fr> + + * pkg/pkg.m create_pkgadddel): Resolve variable name-clash from + previous change. + 2006-08-26 David Bateman <dbateman@free.fr> * pkg/pkg.m (install, uninstall, installed_packages): Allow for
--- a/scripts/pkg/pkg.m +++ b/scripts/pkg/pkg.m @@ -551,20 +551,21 @@ function create_pkgadddel (desc, packdir, nm) pkg = [desc.dir "/" nm]; fid = fopen(pkg, "wt"); + if (fid >= 0) ## Search all dot-m files for PKG commands lst = dir ([packdir "inst/*.m"]); for i=1:length(lst) - nm = lst(i).name; - fwrite (fid, extract_pkg (nm, ['^[#%][#%]* *' nm ': *(.*)$'])); + nam = [packdir "inst/" lst(i).name]; + fwrite (fid, extract_pkg (nam, ['^[#%][#%]* *' nm ': *(.*)$'])); endfor ## Search all C++ source files for PKG commands lst = dir ([packdir "src/*.cc"]); for i=1:length(lst) - nm = lst(i).name; - fwrite (fid, extract_pkg (nm, ['^//* *' nm ': *(.*)$'])); - fwrite (fid, extract_pkg (nm, ['^/\** *' nm ': *(.*) *\*/$'])); + nam = [packdir "src/" lst(i).name]; + fwrite (fid, extract_pkg (nam, ['^//* *' nm ': *(.*)$'])); + fwrite (fid, extract_pkg (nam, ['^/\** *' nm ': *(.*) *\*/$'])); endfor ## Add developer included PKG commands