diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-19 15:15:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-19 15:15:07 (GMT) |
| commit | 62304b9cc4ad13f90021368d6fb897395eb1a27b (patch) | |
| tree | 1a250baa7cfe65fb422e7f3cefe6c2c08e0a442b | |
| parent | 0ebd62435dc4cc8b5ba2050d485dc8e5ae794082 (diff) | |
| parent | e8b55fb7335f4091d28524a6ee6266bcc6c2e87d (diff) | |
| download | tcl-62304b9cc4ad13f90021368d6fb897395eb1a27b.zip tcl-62304b9cc4ad13f90021368d6fb897395eb1a27b.tar.gz tcl-62304b9cc4ad13f90021368d6fb897395eb1a27b.tar.bz2 | |
Merge 8.7
| -rw-r--r--[-rwxr-xr-x] | tools/tcltk-man2html.tcl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index aa3ecce..152ab42 100755..100644 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -4,7 +4,7 @@ if {[catch {package require Tcl 8.6-} msg]} { puts stderr "ERROR: $msg" puts stderr "If running this script from 'make html', set the\ NATIVE_TCLSH environment\nvariable to point to an installed\ - tclsh9.0 (or the equivalent tclsh90.exe\non Windows)." + tclsh8.6 (or the equivalent tclsh86.exe\non Windows)." exit 1 } @@ -741,7 +741,11 @@ try { # ... but try to extract (name, version) from subdir contents try { - set f [open [file join $pkgsDir $dir configure.ac]] + try { + set f [open [file join $pkgsDir $dir configure.in]] + } trap {POSIX ENOENT} {} { + set f [open [file join $pkgsDir $dir configure.ac]] + } foreach line [split [read $f] \n] { if {2 == [scan $line \ { AC_INIT ( [%[^]]] , [%[^]]] ) } n v]} { |