summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-08-02 14:46:04 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-08-02 14:46:04 (GMT)
commit7458c836b3edcc7c34e31c91235e3e52e0f7d5c9 (patch)
tree5156fc2f5b2d062fa08731b94d7e35d790ee73d8
parent448030e37ec7508c06c212e4ea97aa09723e37fc (diff)
parentff2d7ecb2916f4732bc397c7b640acc2d2100a24 (diff)
downloadtcl-7458c836b3edcc7c34e31c91235e3e52e0f7d5c9.zip
tcl-7458c836b3edcc7c34e31c91235e3e52e0f7d5c9.tar.gz
tcl-7458c836b3edcc7c34e31c91235e3e52e0f7d5c9.tar.bz2
merge to rc
-rw-r--r--ChangeLog1
-rwxr-xr-xtools/tcltk-man2html.tcl2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 060cd04..f9da582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2011-08-02 Don Porter <dgp@users.sourceforge.net>
* changes: Updates for 8.6b2 release.
+ * tools/tcltk-man2html.tcl: Variable substitution botch.
2011-08-02 Donal K. Fellows <dkf@users.sf.net>
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index eaadc51..552095e 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -774,7 +774,7 @@ proc plus-pkgs {type args} {
continue
}
}
- regexp "pkgs/$dir(.*)/doc$" [glob $tcltkdir/$tcldir/pkgs/$dir*/doc] \
+ regexp "pkgs/${dir}(.*)/doc$" [glob $tcltkdir/$tcldir/pkgs/$dir*/doc] \
-> version
switch $type {
n {