diff options
author | Kevin B Kenny <kennykb@acm.org> | 2004-08-18 20:59:20 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2004-08-18 20:59:20 (GMT) |
commit | 53141db9967b22cf67fd4a345ee469f685093f16 (patch) | |
tree | 75f7ddb9d5363f23cf8ac328d02811c067a8e0ee /win | |
parent | fab56e2415bbbc5e2355f500b28d26c5e907ef29 (diff) | |
download | tcl-53141db9967b22cf67fd4a345ee469f685093f16.zip tcl-53141db9967b22cf67fd4a345ee469f685093f16.tar.gz tcl-53141db9967b22cf67fd4a345ee469f685093f16.tar.bz2 |
unbreak Win build after TIP#173 and TIP#209 commit
Diffstat (limited to 'win')
-rw-r--r-- | win/Makefile.in | 16 | ||||
-rw-r--r-- | win/makefile.vc | 15 |
2 files changed, 27 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 06c9a7b..ac2ea0d 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.79 2004/07/20 10:23:14 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.80 2004/08/18 20:59:35 kennykb Exp $ VERSION = @TCL_VERSION@ @@ -514,7 +514,7 @@ install-binaries: binaries $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg1.1; \ fi -install-libraries: libraries +install-libraries: libraries install-tzdata install-msgs @for i in $(prefix)/lib $(INCLUDE_INSTALL_DIR) \ $(SCRIPT_INSTALL_DIR); \ do \ @@ -573,6 +573,18 @@ install-libraries: libraries $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \ done; +install-tzdata: + @echo "Installing time zone data" + @TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \ + "$(ROOT_DIR)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata" + +install-msgs: + @echo "Installing message catalogs" + @TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \ + "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs" + install-doc: doc # Optional target to install private headers diff --git a/win/makefile.vc b/win/makefile.vc index ec11e56..2df2cdb 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.129 2004/06/24 01:29:07 mistachkin Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.130 2004/08/18 20:59:36 kennykb Exp $ #------------------------------------------------------------------------------ !if !defined(MSDEVDIR) && !defined(MSVCDIR) @@ -863,7 +863,7 @@ install-binaries: @echo installing $(TCLSTUBLIBNAME) @$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\" -install-libraries: tclConfig +install-libraries: tclConfig install-msgs install-tzdata @echo installing tclConfig.sh @$(CPY) "$(OUT_DIR)\tclConfig.sh" "$(LIB_INSTALL_DIR)\" @echo installing http1.0 @@ -914,6 +914,17 @@ install-libraries: tclConfig @$(CPY) "$(ROOT)\library\word.tcl" "$(SCRIPT_INSTALL_DIR)\" @$(CPY) "$(ROOT)\library\auto.tcl" "$(SCRIPT_INSTALL_DIR)\" +install-tzdata: + @echo "Installing time zone data" + set TCL_LIBRARY="$(ROOT)/library" + $(TCLSH) "$(ROOT)/tools/installData.tcl" \ + "$(ROOT)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata" + +install-msgs: + @echo "Installing message catalogs" + set TCL_LIBRARY="$(ROOT)/library" + $(TCLSH) "$(ROOT)/tools/installData.tcl" \ + "$(ROOT)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs" #--------------------------------------------------------------------- # Clean up |