diff options
| author | dgp <dgp@users.sourceforge.net> | 2001-08-27 02:14:08 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2001-08-27 02:14:08 (GMT) |
| commit | 9c25bc6dc6c615313b4574356e71d451185a634e (patch) | |
| tree | f31e368814b12a6533c90e289fe7be521f22108f /library/auto.tcl | |
| parent | 1f0268c256e80edaaaac53ece4b31fac44354220 (diff) | |
| download | tcl-9c25bc6dc6c615313b4574356e71d451185a634e.zip tcl-9c25bc6dc6c615313b4574356e71d451185a634e.tar.gz tcl-9c25bc6dc6c615313b4574356e71d451185a634e.tar.bz2 | |
* Corrected
inconsistency between the search path for script libraries and
the directory name $DISTNAME into which distributions built
by 'make test' unpack. [Bug 455642]
Diffstat (limited to 'library/auto.tcl')
| -rw-r--r-- | library/auto.tcl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index 1281b76..2ad40eb 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -3,7 +3,7 @@ # utility procs formerly in init.tcl dealing with auto execution # of commands and can be auto loaded themselves. # -# RCS: @(#) $Id: auto.tcl,v 1.7 2000/02/08 10:06:12 hobbs Exp $ +# RCS: @(#) $Id: auto.tcl,v 1.8 2001/08/27 02:14:08 dgp Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1998 Sun Microsystems, Inc. @@ -60,7 +60,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { # The C application may have hardwired a path, which we honor - if {[info exist the_library] && [string compare $the_library {}]} { + if {[info exists the_library] && [string compare $the_library {}]} { lappend dirs $the_library } else { @@ -82,8 +82,10 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { # ../../lib/foo1.0 (From bin/arch directory in install hierarchy) # ../library (From unix directory in build hierarchy) # ../../library (From unix/arch directory in build hierarchy) - # ../../foo1.0b1/library (From unix directory in parallel build hierarchy) - # ../../../foo1.0b1/library (From unix/arch directory in parallel build hierarchy) + # ../../foo1.0.1/library + # (From unix directory in parallel build hierarchy) + # ../../../foo1.0.1/library + # (From unix/arch directory in parallel build hierarchy) set parentDir [file dirname [file dirname [info nameofexecutable]]] set grandParentDir [file dirname $parentDir] @@ -91,11 +93,9 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { lappend dirs [file join $grandParentDir lib $basename$version] lappend dirs [file join $parentDir library] lappend dirs [file join $grandParentDir library] - if {![regexp {.*[ab][0-9]*} $patch ver]} { - set ver $version - } - lappend dirs [file join $grandParentDir $basename$ver library] - lappend dirs [file join [file dirname $grandParentDir] $basename$ver library] + lappend dirs [file join $grandParentDir $basename$patch library] + lappend dirs [file join [file dirname $grandParentDir] \ + $basename$patch library] } foreach i $dirs { set the_library $i |