Index: config/Project.tmpl
===================================================================
RCS file: /p/paradise/cvs_repository/config/Project.tmpl,v
retrieving revision 1.273
diff -c -r1.273 Project.tmpl
*** config/Project.tmpl	21 Jan 2004 04:21:18 -0000	1.273
--- config/Project.tmpl	30 Jan 2004 21:33:32 -0000
***************
*** 360,366 ****
  
  
  #if IS_NT
! TCL_INCL = -I$(TCL_DIR)/include
  #ifdef UNIX_PATHS
  /* provide DOS style filename to linker :-( */
  TCL_LIB = $(UNIX_DSK):$(TCL_DIR)/lib/tcl$(TCL_VER)$(TCL_LIBEXT) 
--- 360,366 ----
  
  
  #if IS_NT
! TCL_INC = $(TCL_DIR)/include
  #ifdef UNIX_PATHS
  /* provide DOS style filename to linker :-( */
  TCL_LIB = $(UNIX_DSK):$(TCL_DIR)/lib/tcl$(TCL_VER)$(TCL_LIBEXT) 
***************
*** 372,382 ****
  
  #ifndef TCL_DEF
  /* TCL_DIR = $(TCL_DIR)  this is defined at the top now */
! TCL_INCL = -I$(TCL_DIR)/include
  TCL_LIB = $(TCL_DIR)/lib/libtcl$(TCL_VER)$(TCL_LIBEXT)
  #else
  #undef TCL_DEF
  #endif
  
  TRANSPORT_LIB =
  TRANSPORT_INCL =
--- 372,390 ----
  
  #ifndef TCL_DEF
  /* TCL_DIR = $(TCL_DIR)  this is defined at the top now */
! TCL_INC = $(TCL_DIR)/include
  TCL_LIB = $(TCL_DIR)/lib/libtcl$(TCL_VER)$(TCL_LIBEXT)
  #else
  #undef TCL_DEF
  #endif
+ 
+ /* On some platforms, gcc-3 moans if -I/usr/include because tcl is installed
+    as part of the system instead of an add-on.   This only adds the
+    include if it isn't /usr/include. */
+ TCL_INCL =
+ ifneq (/usr/include,$(TCL_INC))
+ TCL_INCL += -I$(TCL_INC)
+ endif
  
  TRANSPORT_LIB =
  TRANSPORT_INCL =
Index: config/darwin_generic.def
===================================================================
RCS file: /p/paradise/cvs_repository/config/darwin_generic.def,v
retrieving revision 1.1
diff -c -r1.1 darwin_generic.def
*** config/darwin_generic.def	18 Oct 2003 03:00:28 -0000	1.1
--- config/darwin_generic.def	30 Jan 2004 21:29:16 -0000
***************
*** 5,11 ****
  FLEX_DIR = /usr/bin
  PERL_DIR = /usr
  
! TCL_INCL = -I$(TCL_DIR)/include
  TCL_LIB = $(TCL_DIR)/lib/libtcl.a
  #define	TCL_DEF
  
--- 5,11 ----
  FLEX_DIR = /usr/bin
  PERL_DIR = /usr
  
! TCL_INC = $(TCL_DIR)/include
  TCL_LIB = $(TCL_DIR)/lib/libtcl.a
  #define	TCL_DEF
  
Index: config/linux_generic.def
===================================================================
RCS file: /p/paradise/cvs_repository/config/linux_generic.def,v
retrieving revision 1.4
diff -c -r1.4 linux_generic.def
*** config/linux_generic.def	25 Jan 2001 20:04:23 -0000	1.4
--- config/linux_generic.def	30 Jan 2004 21:29:25 -0000
***************
*** 5,11 ****
  FLEX_DIR = /usr/bin
  PERL_DIR = /usr
  
! TCL_INCL = -I$(TCL_DIR)/include
  TCL_LIB = -ltcl
  #define	TCL_DEF
  
--- 5,11 ----
  FLEX_DIR = /usr/bin
  PERL_DIR = /usr
  
! TCL_INC = $(TCL_DIR)/include
  TCL_LIB = -ltcl
  #define	TCL_DEF
  
Index: config/netbsd_generic.def
===================================================================
RCS file: /p/paradise/cvs_repository/config/netbsd_generic.def,v
retrieving revision 1.1
diff -c -r1.1 netbsd_generic.def
*** config/netbsd_generic.def	13 Feb 2002 22:47:56 -0000	1.1
--- config/netbsd_generic.def	30 Jan 2004 21:29:35 -0000
***************
*** 5,10 ****
  FLEX_DIR = /usr/bin
  PERL_DIR = /usr/pkg/
  
! TCL_INCL = -I/usr/pkg/include
  TCL_LIB = /usr/pkg/lib/libtcl.a
  #define	TCL_DEF
--- 5,10 ----
  FLEX_DIR = /usr/bin
  PERL_DIR = /usr/pkg/
  
! TCL_INC = /usr/pkg/include
  TCL_LIB = /usr/pkg/lib/libtcl.a
  #define	TCL_DEF