diff options
| author | welch <welch@noemail.net> | 1998-08-07 11:02:16 (GMT) |
|---|---|---|
| committer | welch <welch@noemail.net> | 1998-08-07 11:02:16 (GMT) |
| commit | 085e6ddf3e85cf2e83a663eeb8f9761b8ecaa3a4 (patch) | |
| tree | 46aae7dd92e39d66f396cf905d442377c091154f | |
| parent | cd24ab167a03e55220ebae04eafa71e485f33c35 (diff) | |
| download | tcl-085e6ddf3e85cf2e83a663eeb8f9761b8ecaa3a4.zip tcl-085e6ddf3e85cf2e83a663eeb8f9761b8ecaa3a4.tar.gz tcl-085e6ddf3e85cf2e83a663eeb8f9761b8ecaa3a4.tar.bz2 | |
Nuked / from file paths
FossilOrigin-Name: b093be41bf0a4fd22db551aad1ebaa3e35f4c6d0
| -rw-r--r-- | generic/tclInitScript.h | 10 | ||||
| -rw-r--r-- | library/init.tcl | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclInitScript.h b/generic/tclInitScript.h index 4c76bf5..a2601b7 100644 --- a/generic/tclInitScript.h +++ b/generic/tclInitScript.h @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: %Z% $Id: tclInitScript.h,v 1.5 1998/08/06 15:22:54 welch Exp $ + * SCCS: %Z% $Id: tclInitScript.h,v 1.6 1998/08/07 11:02:49 welch Exp $ */ /* @@ -78,8 +78,8 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\ lappend dirs $tclDefaultLibrary\n\ unset tclDefaultLibrary\n\ set parentDir [file dirname [file dirname [info nameofexecutable]]]\n\ - lappend dirs [file join $parentDir lib/tcl$tcl_version]\n\ - lappend dirs [file join [file dirname $parentDir] lib/tcl$tcl_version]\n\ + lappend dirs [file join $parentDir lib tcl$tcl_version]\n\ + lappend dirs [file join [file dirname $parentDir] lib tcl$tcl_version]\n\ lappend dirs [file join $parentDir library]\n\ lappend dirs [file join [file dirname $parentDir] library]\n\ if {[string match {*[ab]*} $tcl_patchLevel]} {\n\ @@ -87,8 +87,8 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\ } else {\n\ set ver $tcl_version\n\ }\n\ - lappend dirs [file join [file dirname $parentDir] tcl$ver/library]\n\ - lappend dirs [file join [file dirname [file dirname $parentDir]] tcl$ver/library]\n\ + lappend dirs [file join [file dirname $parentDir] tcl$ver library]\n\ + lappend dirs [file join [file dirname [file dirname $parentDir]] tcl$ver library]\n\ }\n\ foreach i $dirs {\n\ set tcl_library $i\n\ diff --git a/library/init.tcl b/library/init.tcl index fa8a83c..2597b84 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -626,8 +626,8 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { } else { 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$ver library] + lappend dirs [file join [file dirname $grandParentDir] $basename$ver library] } foreach i $dirs { set the_library $i |