diff options
| author | hershey <hershey> | 1999-07-21 02:01:36 (GMT) |
|---|---|---|
| committer | hershey <hershey> | 1999-07-21 02:01:36 (GMT) |
| commit | 260866213706058f45fa00cd53cda25614228082 (patch) | |
| tree | fd1832a309ca508b8e298c8853b2310ab363342d /unix/tclUnixInit.c | |
| parent | 8cc4afecef5625f0c32a63a6a3e8bb6eed1a5eff (diff) | |
| download | tcl-260866213706058f45fa00cd53cda25614228082.zip tcl-260866213706058f45fa00cd53cda25614228082.tar.gz tcl-260866213706058f45fa00cd53cda25614228082.tar.bz2 | |
* generic/tclInitScript.h:
* unix/tclUnixInit.c: merged code with 8.0.5. We now use an
intermediate global tcl var "tclDefaultLibrary" to keep the
"tcl_library" var from being set by the default value in the
Makefile. Also fixed a bug in which caused the value of
TCL_LIBRARY env var to be ignored.
* unix/tclWinInit.c: just updated some comments.
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 4d5f8c7..344686d 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -4,11 +4,10 @@ * Contains the Unix-specific interpreter initialization functions. * * Copyright (c) 1995-1997 Sun Microsystems, Inc. + * Copyright (c) 1999 by Scriptics Corporation. + * All rights reserved. * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * RCS: @(#) $Id: tclUnixInit.c,v 1.15 1999/05/14 02:18:32 stanton Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.16 1999/07/21 02:01:36 hershey Exp $ */ #include "tclInt.h" @@ -521,7 +520,8 @@ TclpSetInitialEncodings() * None. * * Side effects: - * Sets "tcl_library" and "tcl_platform" Tcl variables. + * Sets "tclDefaultLibrary", "tcl_pkgPath", and "tcl_platform" Tcl + * variables. * *---------------------------------------------------------------------- */ @@ -537,7 +537,7 @@ TclpSetVariables(interp) char *user; Tcl_DString ds; - Tcl_SetVar(interp, "tcl_library", defaultLibraryDir, TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY); Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY); unameOK = 0; |