summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2003-03-11 23:31:54 (GMT)
committerKevin B Kenny <kennykb@acm.org>2003-03-11 23:31:54 (GMT)
commit7be603f3c85d34e87e54b45c813ecbe337c89854 (patch)
treee502b7a9e0da4a2f5529b597479ce6fee9149ca7
parent1238067f586fbaeae2bd4884928148be043cdf12 (diff)
downloadtk-7be603f3c85d34e87e54b45c813ecbe337c89854.zip
tk-7be603f3c85d34e87e54b45c813ecbe337c89854.tar.gz
tk-7be603f3c85d34e87e54b45c813ecbe337c89854.tar.bz2
Backported the code that makes the makefile build pkgIndex.tcl as part
of the install step.
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35eb60f..7537547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-07 Jim Ingham <jingham@apple.com>
* macosx/tkMacOSXMenus.c (TkMacOSXInitMenus): No longer need
diff --git a/win/makefile.vc b/win/makefile.vc
index a225626..f79188f 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.68 2003/03/04 23:50:49 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.69 2003/03/11 23:31:55 kennykb Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -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)\"