Bring back Makefile's how they were

win/Makefile.in

@@ -547,15 +547,10 @@ ${TCL_ZIP_FILE}:  ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE}
 	@mkdir -p ${TCL_VFS_PATH}
 	@echo "creating ${TCL_VFS_PATH} (prepare compression)"
 	@( \
-	  $(COPY) -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}; \
-	  $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl; \
-	  if test "${ZIPFS_BUILD}" != "2" ; then \
-	    $(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde; \
-	    $(COPY) ${REG_DLL_FILE} ${TCL_VFS_PATH}/registry; \
-	  else \
+	    $(COPY) -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}; \
+	    $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl; \
 	    rm -rf ${TCL_VFS_PATH}/dde; \
 	    rm -rf ${TCL_VFS_PATH}/registry; \
-	  fi \
 	)
 	(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \
 	  (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \

win/makefile.vc

@@ -52,7 +52,7 @@
 # 64-bit compiler, if your SDK has it.
 #
 # Basic macros and options usable on the commandline (see rules.vc for more info):
-#	OPTS=nomsvcrt,noembed,nothreads,pdbs,profile,static,symbols,thrdalloc,unchecked,none
+#	OPTS=memorymodule,nomsvcrt,noembed,nothreads,pdbs,profile,static,symbols,thrdalloc,unchecked,none
 #		Sets special options for the core.  The default is for none.
 #		Any combination of the above may be used (comma separated).
 #		'none' will over-ride everything to nothing.
@@ -674,16 +674,11 @@ $(TCLSCRIPTZIP): $(TCLLIB) $(TCLSH) dlls
 	@$(MKDIR) "$(LIBTCLVFS)"
 	@$(CPYDIR) $(LIBDIR) "$(LIBTCLVFS)\tcl_library"
 	@move /y "$(LIBTCLVFS)\tcl_library\manifest.txt"  "$(LIBTCLVFS)\tcl_library\pkgIndex.tcl" > NUL
-!if $(STATIC_BUILD)
 # Remove the registry and dde directories as the DLLS are still external
 	@del "$(LIBTCLVFS)\tcl_library\registry\pkgIndex.tcl"
 	@rmdir "$(LIBTCLVFS)\tcl_library\registry"
 	@del "$(LIBTCLVFS)\tcl_library\dde\pkgIndex.tcl"
 	@rmdir "$(LIBTCLVFS)\tcl_library\dde"
-!else
-    @$(COPY) $(TCLDDELIB) "$(LIBTCLVFS)\tcl_library\dde
-    @$(COPY) $(TCLREGLIB) "$(LIBTCLVFS)\tcl_library\registry
-!endif
 	@echo cd {$(OUT_DIR)} > "$(OUT_DIR)\zipper.tcl"
 	@echo file delete -force {$(@F)} >> "$(OUT_DIR)\zipper.tcl"
 	@echo zipfs mkzip {$(@F)} {$(LIBTCLVFSSUBDIR)} {$(LIBTCLVFSSUBDIR)} >> "$(OUT_DIR)\zipper.tcl"
@@ -1146,17 +1141,13 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	    "$(MODULE_INSTALL_DIR)\9.0\platform\shell-$(PKG_SHELL_VER).tm"
 !endif
 	@echo Installing $(TCLDDELIBNAME)
-!if !$(STATIC_BUILD)
 	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
 	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
 	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
-!endif
 	@echo Installing $(TCLREGLIBNAME)
-!if !$(STATIC_BUILD)
 	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\registry$(REGDOTVERSION)\"
 	@$(CPY) "$(ROOT)\library\registry\pkgIndex.tcl" \
 	    "$(LIB_INSTALL_DIR)\registry$(REGDOTVERSION)\"
-!endif
 !if !$(TCL_EMBED_SCRIPTS)
 	@echo Installing encodings
 	@$(CPY) "$(ROOT)\library\encoding\*.enc" \