diff options
| author | dgp <dgp@noemail.net> | 2003-11-17 02:20:18 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2003-11-17 02:20:18 (GMT) |
| commit | e483758c7561136796e62db169ac934227825670 (patch) | |
| tree | c7ac3ad2d0e9f539f60216f69200637b8e52d62c | |
| parent | 1755400aa5d0a3c59b8e4bd9809eed8d3c9f1b91 (diff) | |
| download | tk-e483758c7561136796e62db169ac934227825670.zip tk-e483758c7561136796e62db169ac934227825670.tar.gz tk-e483758c7561136796e62db169ac934227825670.tar.bz2 | |
* win/makefile.vc: Restored consistency of pkgIndex.tcl file
with that generated by Makefile.
FossilOrigin-Name: 6aee53f39a2488ee2a0bb4f36cf56ffaf31d98fe
| -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 David Gravereaux <davygrvy@pobox.com> * 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 |