--- a/nt/ChangeLog	Sun Apr 07 19:36:14 2002 +0000
+++ b/nt/ChangeLog	Sat Apr 13 20:31:34 2002 +0000
@@ -1,3 +1,15 @@
+2002-04-13  Jonathan Harris  <jonathan@xemacs.org>
+
+	* README: Document MSVC6 required
+	* minitar.c: Fix MSVC compiler warnings
+	* minitar.mak: Removed
+	* xemacs.mak: Build minitar directly from this makefile
+	* xemacs.mak (check-temacs):
+	* xemacs.mak (make-docargs):
+	* xemacs.mak (update-elc):
+	Remove obsolete references to EMACSBOOTSTRAPLOADPATH and
+	EMACSBOOTSTRAPMODULEPATH environment variables.
+
 2002-04-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.6 "bok choi" is released.

--- a/nt/README	Sun Apr 07 19:36:14 2002 +0000
+++ b/nt/README	Sat Apr 13 20:31:34 2002 +0000
@@ -16,8 +16,7 @@
 * Required tools and sources
 ============================
 
-1.  You will need Visual C++ V4.0 or later to compile everything. Personally
-    we have tested V4.0, V4.2, V5.0 and v6.0.
+1.  You will need Visual C++ V6.0 or later to compile everything.
 
     Note that Visual C++ assumes that the environment variables INCLUDE and
     LIB are set to specify the location of the includes and libraries.
@@ -25,11 +24,11 @@
     vc\bin and sharedide\bin directories.
 
     Visual C++ V5.0 and later install a batch file called vcvars32.bat in
-    c:\Program Files\DevStudio\VC\bin\ (or wherever you installed it) that you
-    can run before building to set up all of these environment variables.
-    Alternatively, you can choose at setup time to have these
-    environment variables automatically set up in the registry, which
-    is generally a good idea.
+    c:\Program Files\Microsoft Visual Studio\VC98\bin\ (or wherever you
+    installed it) that you can run before building to set up all of these
+    environment variables.  Alternatively, you can choose at setup time to
+    have these environment variables automatically set up in the registry,
+    which is generally a good idea.
 
 
 2.  Grab the latest XEmacs source from

--- a/nt/minitar.c	Sun Apr 07 19:36:14 2002 +0000
+++ b/nt/minitar.c	Sat Apr 13 20:31:34 2002 +0000
@@ -13,9 +13,13 @@
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <io.h>
+#ifdef WIN32_NATIVE
+# include <direct.h>	/* For mkdir */
+#endif
 
 #include <zlib.h>
 

--- a/nt/minitar.mak	Sun Apr 07 19:36:14 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-ZLIB=\path\to\zlib
-LIB_SRC=.
-NT=.
-
-all: $(LIB_SRC)\minitar.exe
-
-$(LIB_SRC)\minitar.exe: $(LIB_SRC)\minitar.obj
-	cl -o $@ $(LIB_SRC)\minitar.obj $(ZLIB)\zlib.lib
-
-$(LIB_SRC)\minitar.obj: $(NT)\minitar.c
-	cl -Fo$@ -c $(NT)\minitar.c -I $(ZLIB)
-

--- a/nt/xemacs.mak	Sun Apr 07 19:36:14 2002 +0000
+++ b/nt/xemacs.mak	Sat Apr 13 20:31:34 2002 +0000
@@ -560,14 +560,14 @@
 	cd $(NT)
 
 # Individual dependencies
-ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(LIB_SRC)/../src/regex.c
+ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c
 $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
 $(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
 	cd $(LIB_SRC)
 	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no
 	cd $(NT)
-$(LIB_SRC)/minitar.exe : $(NT)/minitar.mak $(NT)/minitar.c
-	nmake -nologo -f minitar.mak ZLIB="$(ZLIB_DIR)" NT="$(NT)" LIB_SRC="$(LIB_SRC)"
+$(LIB_SRC)/minitar.exe : $(NT)/minitar.c
+	$(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** "$(ZLIB_DIR)\zlib.lib" -link -incremental:no
 
 LIB_SRC_TOOLS = \
 	$(LIB_SRC)/etags.exe		\
@@ -590,9 +590,6 @@
 	$(LIB_SRC_TOOLS)
 !endif
 
-# Shorthand target
-minitar: $(LIB_SRC)/minitar.exe
-
 #------------------------------------------------------------------------------
 
 # dump-id.c file that contains the dump id
@@ -962,8 +959,6 @@
 
 check-temacs:
 	cd $(SRC)
-	set EMACSBOOTSTRAPLOADPATH=$(LISP)
-	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	$(run_temacs) $(batch_test_emacs)
 
 # Section handling automated tests ends here
@@ -1167,7 +1162,7 @@
 	$(MAKEINFO) new-users-guide.texi
 	cd ..
 
-info:	makeinfo-test $(INFO_FILES)
+info:	$(INFO_FILES)
 
 makeinfo-test:
 	@<<makeinfo_test.bat
@@ -1211,14 +1206,10 @@
 
 $(DOC): $(LIB_SRC)\make-docfile.exe make-docargs
 	if exist $(DOC) $(DEL) $(DOC)
-	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
-	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) @$(OUTDIR)\make-docfile.tmp
 
 update-elc:
-	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
-	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\update-elc.el
 
 # This file is touched by update-elc.el when redumping is necessary.
@@ -1231,8 +1222,6 @@
 $(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP
 	@echo >$(TEMACS_DIR)\SATISFIED
 	cd $(TEMACS_DIR)
-	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
-	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\loadup.el dump
 !if $(USE_PORTABLE_DUMPER)
 	rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc

--- a/src/unexnt.c	Sun Apr 07 19:36:14 2002 +0000
+++ b/src/unexnt.c	Sat Apr 13 20:31:34 2002 +0000
@@ -128,7 +128,7 @@
     {
       char executable_path[PATH_MAX];
 
-      if (GetModuleFileName (NULL, executable_path, PATH_MAX) == 0) 
+      if (GetModuleFileNameA (NULL, executable_path, PATH_MAX) == 0) 
 	{
 	  exit (1);
 	}
@@ -225,7 +225,7 @@
   dump_bss_and_heap (&in_file, &out_file);
 
   /* Patch up header fields; profiler is picky about this. */
-  hImagehelp = LoadLibrary ("imagehlp.dll");
+  hImagehelp = LoadLibraryA ("imagehlp.dll");
   if (hImagehelp)
   {
     PIMAGE_DOS_HEADER dos_header;
@@ -534,14 +534,14 @@
   void  *file_base;
   unsigned long size, upper_size, n_read;
 
-  file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-		     OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+  file = CreateFileA (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+		      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
   if (file == INVALID_HANDLE_VALUE) 
     abort ();
 
   size = GetFileSize (file, &upper_size);
-  file_mapping = CreateFileMapping (file, NULL, PAGE_WRITECOPY, 
-				    0, size, NULL);
+  file_mapping = CreateFileMappingA (file, NULL, PAGE_WRITECOPY, 
+				     0, size, NULL);
   if (!file_mapping) 
     abort ();