diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-06-11 21:55:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-06-11 21:55:53 (GMT) |
| commit | 0646d431b0dd93bb11665e2e53e277b7899557fa (patch) | |
| tree | 0fed0d6aec88326a846f6fa67a5a4e389e66675a | |
| parent | 7ee7c6586422e52f2088758fba43fa65a64c77ef (diff) | |
| download | tcl-0646d431b0dd93bb11665e2e53e277b7899557fa.zip tcl-0646d431b0dd93bb11665e2e53e277b7899557fa.tar.gz tcl-0646d431b0dd93bb11665e2e53e277b7899557fa.tar.bz2 | |
* generic/tclInterp.c: Updated [tclInit] to make $env(TCL_LIBRARY) an
absolute path, and to include the scriptdir,runtime configuration value
on the search path for init.tcl.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tclInterp.c | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2004-06-11 Don Porter <dgp@users.sourceforge.net> + * generic/tclInterp.c: Updated [tclInit] to make $env(TCL_LIBRARY) an + absolute path, and to include the scriptdir,runtime configuration value + on the search path for init.tcl. + * unix/tclUnixInit.c: The routines Tcl_Init() and TclSourceRCFile() * win/tclWinInit.c: had identical implementations for both win and * generic/tclInterp.c: unix. Moved to a single generic implementation. diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 89c6593..389fcf7 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInterp.c,v 1.37 2004/06/11 21:33:41 dgp Exp $ + * RCS: @(#) $Id: tclInterp.c,v 1.38 2004/06/11 21:55:53 dgp Exp $ */ #include "tclInt.h" @@ -52,13 +52,17 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\ lappend dirs $tcl_library\n\ } else {\n\ if {[info exists env(TCL_LIBRARY)]} {\n\ + set env(TCL_LIBRARY) [file join [pwd] $env(TCL_LIBRARY)]\n\ lappend dirs $env(TCL_LIBRARY)\n\ }\n\ catch {\n\ lappend dirs $tclDefaultLibrary\n\ unset tclDefaultLibrary\n\ }\n\ - set dirs [concat $dirs $tcl_libPath]\n\ + catch {\n\ + set dirs [concat $dirs $tcl_libPath]\n\ + }\n\ + lappend dirs [::tcl::pkgconfig get scriptdir,runtime]\n\ }\n\ foreach i $dirs {\n\ set tcl_library $i\n\ |