Search contrib/tcl for tcl startup.

diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 2dd6e5db9e10aff90a41fada7edba48b6409b5ca..1cd1184f1c319fcb26b9ac6425b558b36f29390d 100644 (file)
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.27 1998/09/12 16:04:35 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.28 1998/10/02 01:22:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@
 int32
 pg_atoi(char *s, int size, int c)
 {
-   long        l;
+   long        l = 0;
    char       *badp = (char *) NULL;
 
    Assert(s);

diff --git a/src/pl/tcl/mkMakefile.tcldefs b/src/pl/tcl/mkMakefile.tcldefs
index ba1a9c63af9efa222711bf68116f70e99a2bd02d..9881d6bf99eeec38049fb79ab37d9e220bb6b4fe 100755 (executable)
--- a/src/pl/tcl/mkMakefile.tcldefs
+++ b/src/pl/tcl/mkMakefile.tcldefs
@@ -5,12 +5,15 @@ else
     if [ -f /usr/lib/tclConfig.sh ]; then
    echo "using tclConfig.sh from /usr/lib"
    . /usr/lib/tclConfig.sh
+    elif [ -f /usr/contrib/lib/tclConfig.sh ]; then
+   echo "using tclConfig.sh from /usr/contrib/lib"
+   . /usr/contrib/lib/tclConfig.sh
     else
    if [ -f /usr/local/lib/tclConfig.sh ]; then
        echo "using tclConfig.sh from /usr/local/lib"
        . /usr/local/lib/tclConfig.sh
    else
-       echo "tclConfig.sh not found in /usr/lib or /usr/local/lib"
+       echo "tclConfig.sh not found in /usr/lib, /usr/contrib/lib, or /usr/local/lib"
        echo "I need this file! Please make a symbolic link to this file"
        echo "and start make again."
        exit 1