summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2003-07-21 12:37:08 (GMT)
committerdas <das>2003-07-21 12:37:08 (GMT)
commit27d492af0f1c2bbebe2079b3ff2add4c7908c0b9 (patch)
tree0abada18937b899f617eab00360a79e17deb3dc6
parentdecaef6f53952951464aa852d46a0ecadf00ca0d (diff)
downloadtk-27d492af0f1c2bbebe2079b3ff2add4c7908c0b9.zip
tk-27d492af0f1c2bbebe2079b3ff2add4c7908c0b9.tar.gz
tk-27d492af0f1c2bbebe2079b3ff2add4c7908c0b9.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.tcl4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0155ac3..3b570cc 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>
* library/scale.tcl: Fix for bug 706765 to correctly handle the
diff --git a/macosx/buildTkConfig.tcl b/macosx/buildTkConfig.tcl
index 7f1350a..dba0c51 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.1 2002/09/26 17:07:33 das Exp $
+# RCS: @(#) $Id: buildTkConfig.tcl,v 1.1.2.1 2003/07/21 12:37:08 das Exp $
#
# the next line restarts using tclsh \
exec tclsh8.4 "$0" "$@"
@@ -27,7 +27,7 @@ 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 -all -- {(/tk)/(?:Development|Deployment)} $tkConfig {\1} tkConfig
regsub -line {^(TK_DEFS=')} $tkConfig {\1 -DMAC_OSX_TK} tkConfig
set out [open $tkConfigFile w]