From: Andrew Innes Date: Sat, 6 Jan 2001 21:18:05 +0000 (+0000) Subject: (EMACS_ICON_PATH): Delete definition. X-Git-Tag: emacs-pretest-21.0.95~77 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6da21b33f531d8e40ff3f8d57e41395a9cddb907;p=emacs.git (EMACS_ICON_PATH): Delete definition. (COMPILER_TEMP_FILES): New definition. (MAKETYPE): New definition. --- diff --git a/nt/gmake.defs b/nt/gmake.defs index 6589986ab2f..96dd1f88ebf 100644 --- 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 f979c9688f1..27c1ca342a0 100644 --- 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