Updated to tcl 8.4.1

[pf3gnuchains/pf3gnuchains3x.git] / tcl / generic / tclInitScript.h

diff --git a/tcl/generic/tclInitScript.h b/tcl/generic/tclInitScript.h
index 7494923..dcb94c6 100644 (file)
--- a/tcl/generic/tclInitScript.h
+++ b/tcl/generic/tclInitScript.h
@@ -49,8 +49,10 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\
        if {[info exists env(TCL_LIBRARY)]} {\n\
            lappend dirs $env(TCL_LIBRARY)\n\
        }\n\
-       lappend dirs $tclDefaultLibrary\n\
-       unset tclDefaultLibrary\n\
+       catch {\n\
+           lappend dirs $tclDefaultLibrary\n\
+           unset tclDefaultLibrary\n\
+       }\n\
         set dirs [concat $dirs $tcl_libPath]\n\
     }\n\
     foreach i $dirs {\n\
@@ -62,7 +64,6 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\
            } else {\n\
                append errors \"$tclfile: $msg\n$errorInfo\n\"\n\
            }\n\
-            set tcl_pkgPath [lreplace $tcl_pkgPath end end]\n\
        }\n\
     }\n\
     set msg \"Can't find a usable init.tcl in the following directories: \n\"\n\