diff options
| author | dgp <dgp@users.sourceforge.net> | 2003-11-17 02:15:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2003-11-17 02:15:31 (GMT) |
| commit | efcbe5870a41ae03fb35107532faee500e1431c5 (patch) | |
| tree | 9017df7f08ed8a4efb8c6ac6a00a2b7ee09d8f6c | |
| parent | 5a91364dd5337aba799ecd62bdd54b396adb4ae5 (diff) | |
| download | tk-efcbe5870a41ae03fb35107532faee500e1431c5.zip tk-efcbe5870a41ae03fb35107532faee500e1431c5.tar.gz tk-efcbe5870a41ae03fb35107532faee500e1431c5.tar.bz2 | |
* win/makefile.vc: Restored consistency of pkgIndex.tcl file
with that generated by Makefile.
Let's discuss whether there's really need for a change, and if so,
let's make it consistently in all Makefiles.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/makefile.vc | 10 |
2 files changed, 8 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2003-11-16 Don Porter <dgp@users.sourceforge.net> + + * win/makefile.vc: Restored consistency of pkgIndex.tcl file + with that generated by Makefile. + 2003-11-15 Vince Darley <vincentdarley@users.sourceforge.net> * macosx/tkMacOSXScrlbr.c: [Bug 842952] correct scrollbar diff --git a/win/makefile.vc b/win/makefile.vc index 565d55d..2c5575d 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.75 2003/11/16 06:07:00 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.76 2003/11/17 02:15:32 dgp Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -533,12 +533,8 @@ install-binaries: !if !$(STATIC_BUILD) @echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" -del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" - echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return }> "$(OUT_DIR)\pkgIndex.tcl" - echo if {[info exists ::tcl_platform(debug)]} {>> "$(OUT_DIR)\pkgIndex.tcl" - echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk$(VERSION)g.dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl" - echo } else {>> "$(OUT_DIR)\pkgIndex.tcl" - echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk$(VERSION).dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl" - echo }>> "$(OUT_DIR)\pkgIndex.tcl" + echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl" + echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl" $(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\" !endif |