# HG changeset patch
# User jld
# Date 1045844696 0
# Node ID 41d813de1ffc46bdfe5bc2c2326b9ad4eb67b510
# Parent  603f78f0d43ae527199b56621cabb31914ceba91
* standalone/wxwin/makefile.gnu: Allow a specific installation of Tcl/Tk
  to be referenced using "make TCLDIR=/path/to/tcl".

diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-21  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/makefile.gnu: Allow a specific installation of Tcl/Tk
+	to be referenced using "make TCLDIR=/path/to/tcl".
+
 2003-02-19  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/platformeditordlg.cpp:
diff --git a/host/tools/configtool/standalone/wxwin/makefile.gnu b/host/tools/configtool/standalone/wxwin/makefile.gnu
--- a/host/tools/configtool/standalone/wxwin/makefile.gnu
+++ b/host/tools/configtool/standalone/wxwin/makefile.gnu
@@ -6,6 +6,7 @@
 #   cd emptydir
 #   make -f /path/to/this/makefile WXDIR=/path/to/wx/installation ECOSSRCDIR=/path/to/ecos/tools/src OSTYPE=$OSTYPE
 
+TCLDIR=/usr
 WXDIR=WXDIR_not_defined
 ECOSSRCDIR=ECOSSRCDIR_not_defined
 
@@ -16,12 +17,13 @@ LEVEL=release
 USEEXPERIMENTALCODE=1
 
 EXTRACPPFLAGS=\
+  -I$(TCLDIR)/include \
   -I$(INSTALLDIR)/include \
   -I$(ECOSSRCDIR)/tools/configtool/common/common \
   -I$(ECOSSRCDIR)/tools/Utils/common \
   -I$(ECOSSRCDIR)/tools/ecostest/common \
   -DecUSE_EXPERIMENTAL_CODE=$(USEEXPERIMENTALCODE)
-EXTRALDFLAGS=-L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl
+EXTRALDFLAGS=-L$(TCLDIR)/lib -L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl
 
 ifeq "$(OSTYPE)" "cygwin"
   PROGRAM=configtool.exe