changeset 652:41d813de1ffc

* standalone/wxwin/makefile.gnu: Allow a specific installation of Tcl/Tk to be referenced using "make TCLDIR=/path/to/tcl".
author jld
date Fri, 21 Feb 2003 16:24:56 +0000
parents 603f78f0d43a
children 646a29ef8e22
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/makefile.gnu
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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