From 3f2fff5c5d9813c9b47c8ffc2ea85a66951caf37 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 2 Oct 1998 01:22:43 +0000
Subject: [PATCH] Search contrib/tcl for tcl startup.
---
src/backend/utils/adt/numutils.c | 4 ++--
src/pl/tcl/mkMakefile.tcldefs | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 2dd6e5db9e1..1cd1184f1c3 100644
--- 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 ba1a9c63af9..9881d6bf99e 100755
--- 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
--
GitLab