From 7e306ae6ae29371243e5b7320c415c139221086c Mon Sep 17 00:00:00 2001 From: andreas_kupries Date: Tue, 16 Nov 2004 23:39:48 +0000 Subject: * win/makefile.vc: Fixed bug in installation of http 2.5. * win/makefile.bc: Was installed into directory http2.4. * win/Makefile.in: This has been corrected. * unix/Makefile.in: * tools/tcl.wse.in: * tools/tclmin.wse: --- ChangeLog | 9 +++++++++ tools/tcl.wse.in | 4 ++-- tools/tclmin.wse | 4 ++-- unix/Makefile.in | 8 ++++---- win/Makefile.in | 8 ++++---- win/makefile.bc | 8 ++++---- win/makefile.vc | 6 +++--- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index a942e43..ea518ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-11-16 Andreas Kupries + + * win/makefile.vc: Fixed bug in installation of http 2.5. + * win/makefile.bc: Was installed into directory http2.4. + * win/Makefile.in: This has been corrected. + * unix/Makefile.in: + * tools/tcl.wse.in: + * tools/tclmin.wse: + 2004-11-16 Don Porter * library/auto.tcl: Updated [tcl_findLibrary] search path diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in index be73406..8072252 100644 --- a/tools/tcl.wse.in +++ b/tools/tcl.wse.in @@ -1443,12 +1443,12 @@ item: Install File end item: Install File Source=${__TCLBASEDIR__}\library\http\pkgIndex.tcl - Destination=%MAINDIR%\lib\tcl%VER%\http2.4\pkgIndex.tcl + Destination=%MAINDIR%\lib\tcl%VER%\http2.5\pkgIndex.tcl Flags=0000000000000010 end item: Install File Source=${__TCLBASEDIR__}\library\http\http.tcl - Destination=%MAINDIR%\lib\tcl%VER%\http2.4\http.tcl + Destination=%MAINDIR%\lib\tcl%VER%\http2.5\http.tcl Flags=0000000000000010 end item: Install File diff --git a/tools/tclmin.wse b/tools/tclmin.wse index 2fd8185..2e7f69b 100644 --- a/tools/tclmin.wse +++ b/tools/tclmin.wse @@ -37,12 +37,12 @@ item: Install File end item: Install File Source=n:\dist\tcl8.0\library\http\pkgIndex.tcl - Destination=%MAINDIR%\lib\tcl%VER%\http2.4\pkgIndex.tcl + Destination=%MAINDIR%\lib\tcl%VER%\http2.5\pkgIndex.tcl Flags=0000000000000010 end item: Install File Source=n:\dist\tcl8.0\library\http\http.tcl - Destination=%MAINDIR%\lib\tcl%VER%\http2.4\http.tcl + Destination=%MAINDIR%\lib\tcl%VER%\http2.5\http.tcl Flags=0000000000000010 end item: Install File diff --git a/unix/Makefile.in b/unix/Makefile.in index 561e1d6..d4c92d8 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.121.2.6 2004/07/30 08:32:15 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.121.2.7 2004/11/16 23:39:51 andreas_kupries Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -628,7 +628,7 @@ install-libraries: libraries else true; \ fi; \ done; - @for i in http2.4 http1.0 opt0.4 encoding msgcat1.3 tcltest2.2; \ + @for i in http2.5 http1.0 opt0.4 encoding msgcat1.3 tcltest2.2; \ do \ if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ @@ -656,10 +656,10 @@ install-libraries: libraries do \ $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http1.0; \ done; - @echo "Installing library http2.4 directory"; + @echo "Installing library http2.5 directory"; @for j in $(TOP_DIR)/library/http/*.tcl ; \ do \ - $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http2.4; \ + $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http2.5; \ done; @echo "Installing library opt0.4 directory"; @for j in $(TOP_DIR)/library/opt/*.tcl ; \ diff --git a/win/Makefile.in b/win/Makefile.in index d40a6f1..1dd0684 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.68.2.1 2003/07/16 19:34:14 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.68.2.2 2004/11/16 23:39:52 andreas_kupries Exp $ VERSION = @TCL_VERSION@ @@ -490,7 +490,7 @@ install-libraries: libraries else true; \ fi; \ done; - @for i in http1.0 http2.4 opt0.4 encoding msgcat1.3 tcltest2.2; \ + @for i in http1.0 http2.5 opt0.4 encoding msgcat1.3 tcltest2.2; \ do \ if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ @@ -514,10 +514,10 @@ install-libraries: libraries do \ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \ done; - @echo "Installing library http2.4 directory"; + @echo "Installing library http2.5 directory"; @for j in $(ROOT_DIR)/library/http/*.tcl; \ do \ - $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http2.4"; \ + $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http2.5"; \ done; @echo "Installing library opt0.4 directory"; @for j in $(ROOT_DIR)/library/opt/*.tcl; \ diff --git a/win/makefile.bc b/win/makefile.bc index 918fe21..3c0ea73 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -400,10 +400,10 @@ install-libraries: -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0" -@copy "$(ROOT)\library\http1.0\http.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0" -@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0" - @echo installing http2.4 - -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.4" - -@copy "$(ROOT)\library\http\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.4" - -@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.4" + @echo installing http2.5 + -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.5" + -@copy "$(ROOT)\library\http\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.5" + -@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.5" @echo installing opt0.4 -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4" -@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4" diff --git a/win/makefile.vc b/win/makefile.vc index 029a462..b03f1f4 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.100.2.4 2003/07/16 19:34:14 mdejong Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.100.2.5 2004/11/16 23:39:52 andreas_kupries Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -738,9 +738,9 @@ install-libraries: @echo installing http1.0 @$(CPY) "$(ROOT)\library\http1.0\*.tcl" \ "$(SCRIPT_INSTALL_DIR)\http1.0\" - @echo installing http2.4 + @echo installing http2.5 @$(CPY) "$(ROOT)\library\http\*.tcl" \ - "$(SCRIPT_INSTALL_DIR)\http2.4\" + "$(SCRIPT_INSTALL_DIR)\http2.5\" @echo installing opt0.4 @$(CPY) "$(ROOT)\library\opt\*.tcl" \ "$(SCRIPT_INSTALL_DIR)\opt0.4\" -- cgit v0.12