fixed bug 1571: pkgIndex files fail for dde and registry packages:

6 files changed, 22 insertions, 23 deletions

diff --git a/library/dde1.0/pkgIndex.tcl b/library/dde1.0/pkgIndex.tcl
new file mode 100755
index 0000000..6277759
--- /dev/null
+++ b/library/dde1.0/pkgIndex.tcl
@@ -0,0 +1 @@
+package ifneeded dde 1.0 "load [list [file join $dir tcldde81.dll]] dde"

diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
new file mode 100755
index 0000000..a018073
--- /dev/null
+++ b/library/reg/pkgIndex.tcl
@@ -0,0 +1 @@
+package ifneeded registry 1.0 "load [list [file join $dir tclreg81.dll]] registry"

diff --git a/library/reg1.0/pkgIndex.tcl b/library/reg1.0/pkgIndex.tcl
new file mode 100755
index 0000000..a018073
--- /dev/null
+++ b/library/reg1.0/pkgIndex.tcl
@@ -0,0 +1 @@
+package ifneeded registry 1.0 "load [list [file join $dir tclreg81.dll]] registry"

diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 6274318..a63fd2a 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -1542,7 +1542,7 @@ item: Install File
   Flags=0000000000000010

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\win\pkgIndex.tcl

+  Source=${__TCLBASEDIR__}\library\reg1.0\pkgIndex.tcl

   Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\pkgIndex.tcl

   Flags=0000000000000010

 end

@@ -1552,7 +1552,7 @@ item: Install File
   Flags=0000000000000010

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\win\pkgIndex.tcl

+  Source=${__TCLBASEDIR__}\library\dde1.0\pkgIndex.tcl

   Destination=%MAINDIR%\lib\tcl%VER%\dde1.0\pkgIndex.tcl

   Flags=0000000000000010

 end

diff --git a/win/makefile.vc b/win/makefile.vc
index 37eafbf..b40b844 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
-# RCS: @(#) $Id: makefile.vc,v 1.27 1999/04/17 00:18:26 surles Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.28 1999/04/19 22:05:25 surles Exp $
 
 # Does not depend on the presence of any environment variables in
 # order to compile tcl; all needed information is derived from 
@@ -444,10 +444,6 @@ install-binaries: $(TCLSH)
 	@copy "$(TCLSH)" "$(BIN_INSTALL_DIR)"
 	@echo installing $(TCLPIPEDLLNAME)
 	@copy "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)"
-	@echo installing $(TCLREGDLLNAME)
-	@copy "$(TCLREGDLL)" "$(LIB_INSTALL_DIR)"
-	@echo installing $(TCLDDEDLLNAME)
-	@copy "$(TCLDDEDLL)" "$(LIB_INSTALL_DIR)"
 	@echo installing $(TCLSTUBLIBNAME)
 	@copy "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)"
 
@@ -455,19 +451,31 @@ install-libraries:
 	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
 	-@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
+	@echo installing http1.0
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
-	@copy << "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-package ifneeded registry 1.0 "load [list [file join $$dir .. $(TCLREGDLLNAME)]] registry"
-package ifneeded dde 1.0 "load [list [file join $$dir .. $(TCLDDEDLLNAME)]] dde"
-<<
 	-@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.0
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.0"
 	-@copy "$(ROOT)\library\http2.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.0"
 	-@copy "$(ROOT)\library\http2.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.0"
+	@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"
+	@echo installing $(TCLDDEDLLNAME)
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.0"
+	-@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.0"
+	-@copy "$(ROOT)\library\dde1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.0"
+	@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"
+	@echo installing library files
 	-@copy "$(GENERICDIR)\tcl.h"         "$(INCLUDE_INSTALL_DIR)"
 	-@copy "$(GENERICDIR)\tclDecls.h"    "$(INCLUDE_INSTALL_DIR)"
 	-@copy "$(ROOT)\library\history.tcl" "$(SCRIPT_INSTALL_DIR)"
diff --git a/win/pkgIndex.tcl b/win/pkgIndex.tcl
deleted file mode 100644
index 6c7570a..0000000
--- a/win/pkgIndex.tcl
+++ /dev/null
@@ -1,12 +0,0 @@
-# Tcl package index file, version 1.0
-# This file contains package information for Windows-specific extensions.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: pkgIndex.tcl,v 1.3 1999/04/16 00:48:07 stanton Exp $
-
-package ifneeded registry 1.0 [list tclPkgSetup $dir registry 1.0 {{tclreg81.dll load registry}}]
-package ifneeded dde 1.0 [list tclPkgSetup $dir dde 1.0 {{tcldde81.dll load dde}}]