diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-20 14:08:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-20 14:08:43 (GMT) |
| commit | e2721f9546c9c616a5ce5cadb6769399114fb8b0 (patch) | |
| tree | 7db12bb55f48b1f5620811b997c57a7bc194e1a3 /tools | |
| parent | 14ec7c1d858d00e7c69c80c28cf599095dd3feaf (diff) | |
| parent | b4cc01c658143a39215acceca4a5702dfba1a69b (diff) | |
| download | tcl-e2721f9546c9c616a5ce5cadb6769399114fb8b0.zip tcl-e2721f9546c9c616a5ce5cadb6769399114fb8b0.tar.gz tcl-e2721f9546c9c616a5ce5cadb6769399114fb8b0.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'tools')
| -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 c81acce..c443af9 100755 --- 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\ - tclsh8.7 (or the equivalent tclsh87.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]} { |