From 96fcd84d863cd9ed49b2f5f3c492864fb4019e1d Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 17 Nov 2003 02:20:19 +0000 Subject: * win/makefile.vc: Restored consistency of pkgIndex.tcl file with that generated by Makefile. --- ChangeLog | 5 +++++ win/makefile.vc | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1a111a..9247060 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-11-16 Don Porter + + * win/makefile.vc: Restored consistency of pkgIndex.tcl file + with that generated by Makefile. + 2003-11-15 David Gravereaux * win/makefile.vc: Fixes pkgIndex.tcl generation so a symbols build diff --git a/win/makefile.vc b/win/makefile.vc index 940ad76..9ee562b 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.67.2.4 2003/11/16 06:02:13 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.5 2003/11/17 02:20:20 dgp Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -531,12 +531,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 tk84g.dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl" - echo } else {>> "$(OUT_DIR)\pkgIndex.tcl" - echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk84.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 -- cgit v0.12