# HG changeset patch
# User dbateman
# Date 1156968172 0
# Node ID b1a1c10bf2fdd9a6ff26e4dd70965e3c76b41da4
# Parent  e64059303a6f78a6fa97b16d1fd8960a2d2887cf
[project @ 2006-08-30 20:02:52 by dbateman]

diff -r e64059303a6f -r b1a1c10bf2fd scripts/ChangeLog
--- a/scripts/ChangeLog	Tue Aug 29 16:37:40 2006 +0000
+++ b/scripts/ChangeLog	Wed Aug 30 20:02:52 2006 +0000
@@ -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
diff -r e64059303a6f -r b1a1c10bf2fd scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m	Tue Aug 29 16:37:40 2006 +0000
+++ b/scripts/pkg/pkg.m	Wed Aug 30 20:02:52 2006 +0000
@@ -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