Updating hypnotoad branchhypnotoad

2 files changed, 8 insertions, 26 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index bb6af0c..f9d713d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -649,12 +649,15 @@ ${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE}
 		@TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \
 		${CC_SEARCH_FLAGS} -o ${TCL_EXE}
 
-${TCLKIT_EXE}: ${TCL_EXE}
-	rm -f tclkit.zip
+null.zip:
+	touch .empty
+	zip null.zip .empty 
+
+${TCLKIT_EXE}: ${TCL_EXE} null.zip
 	PWD=`pwd`
-	cd ${prefix}/lib ; zip -rAq ${PWD}/tclkit.zip tcl8 tcl8.6
 	cp -f ${TCL_EXE} ${TCLKIT_EXE}
-	cat tclkit.zip >> ${TCLKIT_EXE}
+	cat null.zip >> ${TCLKIT_EXE}
+	cd ${prefix}/lib ; zip -rAq ${PWD}/${TCLKIT_EXE} tcl8 tcl8.6
 	
 # Must be empty so it doesn't conflict with rule for ${TCL_EXE} above
 ${NATIVE_TCLSH}:
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index cdfff59..95dc38e 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -108,28 +108,7 @@ int
 Tcl_AppInit(
     Tcl_Interp *interp)		/* Interpreter for application. */
 {
-    CONST char *cp=Tcl_GetNameOfExecutable();
-    /* We have to initialize the virtual filesystem before calling
-    ** Tcl_Init().  Otherwise, Tcl_Init() will not be able to find
-    ** its startup script files.
-    */
-    Tcl_Zvfs_Init(interp);
-    if(!Tcl_Zvfs_Mount(interp, cp, "/zvfs")) {
-      Tcl_Obj *vfsinitscript=Tcl_NewStringObj("/zvfs/main.tcl",-1);
-      Tcl_Obj *vfstcllib=Tcl_NewStringObj("/zvfs/tcl8.6",-1);
-
-      Tcl_IncrRefCount(vfsinitscript);
-      Tcl_IncrRefCount(vfstcllib);
-
-      if(Tcl_FSAccess(vfsinitscript,F_OK)==0) {
-        Tcl_SetStartupScript(vfsinitscript,NULL);
-      }
-      if(Tcl_FSAccess(vfstcllib,F_OK)==0) {
-        Tcl_SetVar2(interp, "env", "TCL_LIBRARY", Tcl_GetString(vfstcllib), TCL_GLOBAL_ONLY);
-      }
-      Tcl_DecrRefCount(vfsinitscript);
-      Tcl_DecrRefCount(vfstcllib);
-    }
+    Tcl_Zvfs_Boot(interp);
     
     if ((Tcl_Init)(interp) == TCL_ERROR) {
 	return TCL_ERROR;