(EMACS_ICON_PATH): Delete definition.

(COMPILER_TEMP_FILES): New definition.
(MAKETYPE): New definition.

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 6589986ab2fb89f0937c82e2a7cf031be464eb4e..96dd1f88ebf1ec62e788d61cbf9fedec797d426e 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -76,6 +76,8 @@ SHELLTYPE=SH
 SETLOADPATH=EMACSLOADPATH=$(CURDIR)/../lisp
 endif
 
+MAKETYPE=gmake
+
 # Cygwin has changed quoting rules somewhat since b20, in a way that
 # affects makefiles using sh as the command processor, so we need to
 # detect which rules to use.
@@ -184,6 +186,8 @@ BLD             = $(OBJDIR)/$(ARCH)
 $(BLD):         $(OBJDIR)
                -mkdir "$(BLD)"
 
+COMPILER_TEMP_FILES =
+
 CP             = cp -f
 CP_DIR         = cp -rf
 DEL            = rm
@@ -217,9 +221,6 @@ DQUOTE              = \"
 
 endif
 
-# The location of the icon file
-EMACS_ICON_PATH = ../nt/emacs.ico
-
 ifdef NODEBUG
 DEBUG_FLAG = 
 else

diff --git a/nt/nmake.defs b/nt/nmake.defs
index f979c9688f108c37f87e44f5540ea646b62a5c5f..27c1ca342a04b8b924e00c3abf9161c7c0bc0de1 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -22,6 +22,8 @@ all:
 THE_SHELL = $(COMSPEC)
 SHELLTYPE=CMD
 
+MAKETYPE=nmake
+
 ALL_DEPS       = $**
 
 SUBSYSTEM_WINDOWS=-subsystem:windows
@@ -140,6 +142,8 @@ BLD             = $(OBJDIR)/$(ARCH)
 $(BLD):         $(OBJDIR)
                -mkdir "$(BLD)"
 
+COMPILER_TEMP_FILES = *.pdb
+
 CP             = cp -f
 CP_DIR         = cp -rf
 IFNOTSAMEDIR   = if not exist ..\same-dir.tst
@@ -153,9 +157,6 @@ DQUOTE              = \"
 DEL            = rm
 DEL_TREE       = rm -r
 
-# The location of the icon file
-EMACS_ICON_PATH = ../nt/emacs.ico
-
 !ifdef NODEBUG
 DEBUG_FLAG = 
 !else