diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2003-03-11 23:48:26 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2003-03-11 23:48:26 (GMT) |
| commit | b3560c6510a28841ff4163274f41b0e1d7c2d9e7 (patch) | |
| tree | 66de9dc209e5b17e27c49fc22684e5243f7298e1 | |
| parent | 993e01f8347657079103a0f41bbb5115c9d2f633 (diff) | |
| download | tk-b3560c6510a28841ff4163274f41b0e1d7c2d9e7.zip tk-b3560c6510a28841ff4163274f41b0e1d7c2d9e7.tar.gz tk-b3560c6510a28841ff4163274f41b0e1d7c2d9e7.tar.bz2 | |
Backported the code that makes the makefile build pkgIndex.tcl as part
of the install step.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/makefile.vc | 11 |
2 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2002-03-11 Kevin Kenny <kennykb@users.sourceforge.net> + + * win/makefile.vc: Backported the code that makes the makefile + build pkgIndex.tcl as part of the install step. + 2003-03-03 Jeff Hobbs <jeffh@ActiveState.com> *** 8.4.2 TAGGED FOR RELEASE *** diff --git a/win/makefile.vc b/win/makefile.vc index c8fe5bf..7cc7e06 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 2003/02/14 20:30:36 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.1 2003/03/11 23:48:26 kennykb Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -165,7 +165,7 @@ PROJECT = tk !endif STUBPREFIX = $(PROJECT)stub -DOTVERSION = 8.4 +DOTVERSION = 8.5 VERSION = $(DOTVERSION:.=) WISHNAMEPREFIX = wish @@ -520,6 +520,13 @@ install-binaries: !endif @$(CPY) "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\" @$(CPY) "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\" +!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 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 install-libraries: @$(CPY) "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\" |