* Updated all package install directories to match current Major.minor

	versions of the packages.  Added tcltest package to installation on
	Windows.

5 files changed, 37 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index bcfd852..5c24b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,12 @@
 	* generic/tclParseExpr.c: LogSyntaxError() should reset 
 	the interpreter result [Bug 550142 "Tcl_ExprObj -> abort"] 
 
-
 2002-06-21  Don Porter  <dgp@users.sourceforge.net>
+	
+	* unix/Makefile.in:	Updated all package install directories
+	* win/Makefile.in:	to match current Major.minor versions
+	* win/makefile.bc:	of the packages.  Added tcltest package
+	* win/makefile.vc:	to installation on Windows.
 
 	* library/init.tcl:  Corrected comments and namespace style
         issues.  Thanks to Bruce Stephens. [Bug 572025]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9879ec6..0839b68 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.100 2002/06/06 17:37:55 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.101 2002/06/21 22:23:21 dgp Exp $
 
 VERSION 		= @TCL_VERSION@
 
@@ -590,7 +590,7 @@ install-libraries: libraries
 		else true; \
 		fi; \
 	    done;
-	@for i in http2.4 http1.0 opt0.4 encoding msgcat1.2 tcltest2.0; \
+	@for i in http2.4 http1.0 opt0.4 encoding msgcat1.3 tcltest2.1; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -628,15 +628,15 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/opt0.4; \
 	    done;
-	@echo "Installing library msgcat1.2 directory";
+	@echo "Installing library msgcat1.3 directory";
 	@for j in $(TOP_DIR)/library/msgcat/*.tcl ; \
 	    do \
-	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/msgcat1.2; \
+	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/msgcat1.3; \
 	    done;
-	@echo "Installing library tcltest2.0 directory";
+	@echo "Installing library tcltest2.1 directory";
 	@for j in $(TOP_DIR)/library/tcltest/*.tcl ; \
 	    do \
-	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/tcltest2.0; \
+	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/tcltest2.1; \
 	    done;
 	@echo "Installing library encoding directory";
 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
diff --git a/win/Makefile.in b/win/Makefile.in
index 0c76143..c7f7829 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.61 2002/04/23 17:03:35 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.62 2002/06/21 22:23:21 dgp Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -486,7 +486,7 @@ install-libraries: libraries
 		else true; \
 		fi; \
 	    done;
-	@for i in http1.0 http2.4 opt0.4 encoding msgcat1.2 tcltest2.0; \
+	@for i in http1.0 http2.4 opt0.4 encoding msgcat1.3 tcltest2.1; \
 	    do \
 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -520,15 +520,15 @@ install-libraries: libraries
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
 	    done;
-	@echo "Installing library msgcat1.2 directory";
+	@echo "Installing library msgcat1.3 directory";
 	@for j in $(ROOT_DIR)/library/msgcat/*.tcl; \
 	    do \
-	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/msgcat1.2"; \
+	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/msgcat1.3"; \
 	    done;
-	@echo "Installing library tcltest2.0 directory";
+	@echo "Installing library tcltest2.1 directory";
 	@for j in $(ROOT_DIR)/library/tcltest/*.tcl; \
 	    do \
-	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/tcltest2.0"; \
+	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/tcltest2.1"; \
 	    done;
 	@echo "Installing encodings";
 	@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
diff --git a/win/makefile.bc b/win/makefile.bc
index 2a3eb21..2a3a3a8 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -402,24 +402,28 @@ install-libraries:
 	-@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\http2.4\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.4"
-	-@copy "$(ROOT)\library\http2.4\pkgIndex.tcl" "$(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 opt0.4
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(ROOT)\library\opt0.4\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(ROOT)\library\opt0.4\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	@echo installing msgcat1.0
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
-	-@copy "$(ROOT)\library\msgcat1.0\msgcat.tcl"   "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
-	-@copy "$(ROOT)\library\msgcat1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
+	-@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	-@copy "$(ROOT)\library\opt\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	@echo installing msgcat1.3
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.3"
+	-@copy "$(ROOT)\library\msgcat\msgcat.tcl"   "$(SCRIPT_INSTALL_DIR)\msgcat1.3"
+	-@copy "$(ROOT)\library\msgcat\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.3"
+	@echo installing tcltest2.1
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\tcltest2.1"
+	-@copy "$(ROOT)\library\tcltest\tcltest.tcl"   "$(SCRIPT_INSTALL_DIR)\tcltest2.1"
+	-@copy "$(ROOT)\library\tcltest\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\tcltest2.1"
 	@echo installing $(TCLDDEDLLNAME)
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.1"
 	-@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.1"
-	-@copy "$(ROOT)\library\dde1.1\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.1"
+	-@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.1"
 	@echo installing $(TCLREGDLLNAME)
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\reg1.0"
 	-@copy "$(TCLREGDLL)" "$(SCRIPT_INSTALL_DIR)\reg1.0"
-	-@copy "$(ROOT)\library\reg1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.0"
+	-@copy "$(ROOT)\library\reg\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.0"
 	@echo installing encoding files
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\encoding"
 	-@copy "$(ROOT)\library\encoding\*.enc" "$(SCRIPT_INSTALL_DIR)\encoding"
diff --git a/win/makefile.vc b/win/makefile.vc
index 8a07f85..08b45b7 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.90 2002/05/08 04:25:35 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.91 2002/06/21 22:23:21 dgp Exp $
 #------------------------------------------------------------------------------
 
 !if "$(MSVCDIR)" == ""
@@ -731,9 +731,12 @@ install-libraries:
 	@echo installing opt0.4
 	@xcopy /i /y "$(ROOT)\library\opt\*.tcl" \
 		"$(SCRIPT_INSTALL_DIR)\opt0.4\"
-	@echo installing msgcat1.2
+	@echo installing msgcat1.3
 	@xcopy /i /y "$(ROOT)\library\msgcat\*.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\msgcat1.2\"
+	    "$(SCRIPT_INSTALL_DIR)\msgcat1.3\"
+	@echo installing tcltest2.1 
+	@xcopy /i /y "$(ROOT)\library\tcltest\*.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\tcltest2.1\"
 	@echo installing $(TCLDDELIBNAME)
 !if $(STATIC_BUILD)
 	@xcopy /i /y "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"