summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2003-07-21 12:39:50 (GMT)
committerdas <das>2003-07-21 12:39:50 (GMT)
commitc1eed5a406d7570cf976f9b93374c84ba2975d14 (patch)
treed9865fd05d6460f0515037a01643407a24ee6bd2
parent8d8cf1bc9be1fb34715f276d60caa62e007ef3e4 (diff)
downloadtk-c1eed5a406d7570cf976f9b93374c84ba2975d14.zip
tk-c1eed5a406d7570cf976f9b93374c84ba2975d14.tar.gz
tk-c1eed5a406d7570cf976f9b93374c84ba2975d14.tar.bz2
* macosx/buildTkConfig.tcl: fix to TK_BUILD_* ref generation
broken by changes to tcl buildsystem.
-rw-r--r--ChangeLog5
-rwxr-xr-xmacosx/buildTkConfig.tcl6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ff45ed7..e13463b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-20 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/buildTkConfig.tcl: fix to TK_BUILD_* ref generation
+ broken by changes to tcl buildsystem.
+
2003-07-19 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/tkWinCursor.c (TkGetCursorByName): Fix bug 420510 to provide
diff --git a/macosx/buildTkConfig.tcl b/macosx/buildTkConfig.tcl
index acf9615..8f8f86f 100755
--- a/macosx/buildTkConfig.tcl
+++ b/macosx/buildTkConfig.tcl
@@ -3,7 +3,7 @@
# Synthesize tkConfig.sh for Mac OS X based
# on tclConfig.sh and tkConfig.sh.in
#
-# RCS: @(#) $Id: buildTkConfig.tcl,v 1.2 2003/03/21 01:43:58 das Exp $
+# RCS: @(#) $Id: buildTkConfig.tcl,v 1.3 2003/07/21 12:39:50 das Exp $
#
# the next line restarts using tclsh \
exec tclsh8.4 "$0" "$@"
@@ -27,8 +27,8 @@ proc main {tclConfigFile tkConfigFileIn tkConfigFile} {
regsub -line -- "^TK_$var=.*\$" $tkConfig "TK_$var=$val" tkConfig
}
regsub -line -all -- {@[^@]+@} $tkConfig {} tkConfig
- regsub -line -all -- {/[^/]+\.build/Tk.build} $tkConfig {} tkConfig
- regsub -line {^(TK_DEFS=')} $tkConfig {\1 -DMAC_OSX_TK } tkConfig
+ regsub -line -all -- {(/tk)/(?:Development|Deployment)} $tkConfig {\1} tkConfig
+ regsub -line {^(TK_DEFS=')} $tkConfig {\1 -DMAC_OSX_TK} tkConfig
set out [open $tkConfigFile w]
puts $out $tkConfig