merge 8.7

3 files changed, 5 insertions, 13 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index a3275ba..5be7492 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -630,7 +630,7 @@ install-libraries: libraries install-tzdata install-msgs
 		else true; \
 		fi; \
 	    done;
-	@for i in http1.0 opt0.4 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
+	@for i in opt0.4 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -652,11 +652,6 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
 	    done;
-	@echo "Installing library http1.0 directory";
-	@for j in $(ROOT_DIR)/library/http1.0/*.tcl; \
-	    do \
-	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
-	    done;
 	@echo "Installing package http 2.8.12 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.12.tm;
 	@echo "Installing library opt0.4 directory";
diff --git a/win/makefile.vc b/win/makefile.vc
index de80452..64717af 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -860,9 +860,6 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"
 	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"
 	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"
-	@echo Installing library http1.0 directory
-	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\http1.0\"
 	@echo Installing library opt0.4 directory
 	@$(CPY) "$(ROOT)\library\opt\*.tcl" \
 	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"
diff --git a/win/rules.vc b/win/rules.vc
index 2c61e2d..13b3fba 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 1

+RULES_VERSION_MINOR = 2

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -393,7 +393,7 @@ MSG = ^
 !endif

 

 

-# If INSTALLDIR set to tcl installation root dir then reset to the

+# If INSTALLDIR set to Tcl installation root dir then reset to the

 # lib dir for installing extensions

 !if exist("$(_INSTALLDIR)\include\tcl.h")

 _INSTALLDIR=$(_INSTALLDIR)\lib

@@ -1209,7 +1209,7 @@ RESFILE = $(TMP_DIR)\$(PROJECT).res
 # SCRIPT_INSTALL_DIR - where scripts should be installed

 # INCLUDE_INSTALL_DIR - where C include files should be installed

 # DEMO_INSTALL_DIR - where demos should be installed

-# PRJ_INSTALL_DIR - where package will be installed (not set for tcl and tk)

+# PRJ_INSTALL_DIR - where package will be installed (not set for Tcl and Tk)

 

 !if $(DOING_TCL) || $(DOING_TK)

 LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib

@@ -1231,7 +1231,7 @@ BIN_INSTALL_DIR		= $(PRJ_INSTALL_DIR)
 DOC_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

 SCRIPT_INSTALL_DIR	= $(PRJ_INSTALL_DIR)

 DEMO_INSTALL_DIR	= $(PRJ_INSTALL_DIR)\demos

-INCLUDE_INSTALL_DIR	= $(_TCLDIR)\include

+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include

 

 !endif