Change uses of del to $(DEL).

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index 5e926d6401d635f07faf8e6d6f9c81ac31b3d534..5aa73e50f0f5119ab8c00506046440c56257ca64 100644 (file)
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -92,7 +92,7 @@ $(BLD)\ctags.exe:           ctags.c $(CTAGSOBJ)
                $(LINK) -out:$@ $(LINK_FLAGS) $(CTAGSOBJ) $(LIBS)
 
 ctags.c:       etags.c
-               - del ctags.c
+               - $(DEL) ctags.c
                copy etags.c ctags.c
 
 $(BLD)\ctags.obj: ctags.c
@@ -164,7 +164,7 @@ lisp= \
 
 DOC          = DOC 
 $(DOC):                $(BLD)\make-docfile.exe
-               - del $(DOC)
+               - $(DEL) $(DOC)
                $(BLD)\make-docfile -d ..\src $(obj) > $(DOC)
                $(BLD)\make-docfile -d ..\src $(lisp) >> $(DOC)
                $(CP) $(DOC) ..\etc\DOC-X
@@ -199,10 +199,9 @@ install:   $(INSTALL_FILES)
 #
 # Maintenance
 # 
-clean:;                - del *~ *.pdb
+clean:;                - $(DEL) *~ *.pdb DOC*
                - $(DEL_TREE) deleted
                - $(DEL_TREE) obj
-               - del DOC*
 
 #
 # Headers we would preprocess if we could.

diff --git a/lisp/makefile.nt b/lisp/makefile.nt
index 51e27bdb1ead6db8545263c0d49800834b85179b..a8a7f2a9e7aac959af5fb5c9c557bf7d92709a99 100644 (file)
--- a/lisp/makefile.nt
+++ b/lisp/makefile.nt
@@ -27,15 +27,15 @@ all:
 # Assuming INSTALL_DIR is defined, copy the elisp files to it
 #
 install:;      - mkdir $(INSTALL_DIR)\lisp
-               - del .\same-dir.tst
-               - del $(INSTALL_DIR)\lisp\same-dir.tst
+               - $(DEL) .\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\lisp\same-dir.tst
                echo SameDirTest > $(INSTALL_DIR)\lisp\same-dir.tst
                if not exist .\same-dir.tst $(CP_DIR) . $(INSTALL_DIR)\lisp
-               - del $(INSTALL_DIR)\lisp\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\lisp\same-dir.tst
                
 
 #
 # Maintenance
 # 
-clean:;                - del *~
+clean:;                - $(DEL) *~
                - $(DEL_TREE) deleted

diff --git a/nt/makefile.nt b/nt/makefile.nt
index a540238820a4a69e7e840fc407518e9386eaf41a..42567d61ce4a280eb9478717f86127666d60d49f 100644 (file)
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -72,12 +72,12 @@ install:    all emacs.bat
                cd ..\nt                
                - $(CP) emacs.bat $(INSTALL_DIR)\bin
                - $(ADDPM) $(INSTALL_DIR)
-               - del ..\same-dir.tst
-               - del $(INSTALL_DIR)\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
                if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
-               - del ..\same-dir.tst
-               - del $(INSTALL_DIR)\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
 #
 # This installs executables from ..\bin into the installation directory
@@ -88,19 +88,19 @@ fast_install:
                $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
                - mkdir $(INSTALL_DIR)\bin
                - $(CP) emacs.bat $(INSTALL_DIR)\bin
-               - del ..\same-dir.tst
-               - del $(INSTALL_DIR)\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
                if not exist ..\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin
                if not exist ..\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin
                if not exist ..\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin
                if not exist ..\same-dir.tst nmake -f $(MAKE) real_install
-               - del ..\same-dir.tst
-               - del $(INSTALL_DIR)\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
 real_install:
-               - del ..\same-dir.tst
-               - del $(INSTALL_DIR)\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
                - mkdir $(INSTALL_DIR)\etc
                - mkdir $(INSTALL_DIR)\info
@@ -108,20 +108,19 @@ real_install:
                - mkdir $(INSTALL_DIR)\data
                if not exist ..\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc
                if not exist ..\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info
-               - del ..\same-dir.tst
-               - del $(INSTALL_DIR)\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
 #
 # Maintenance
 # 
 CLEAN_CMD      = $(MAKE) -f makefile.nt clean
-clean:;                - del /s *~ *.pdb
+clean:;                - $(DEL) *~ *.pdb
                - $(DEL_TREE) deleted
                - $(DEL_TREE) obj
                - $(DEL_TREE) ..\bin
-               - del ..\etc\DOC
-               - del ..\etc\DOC-X
-               - del emacs.bat
+               - $(DEL) ..\etc\DOC ..\etc\DOC-X
+               - $(DEL) emacs.bat
                cd ..\lib-src
                $(CLEAN_CMD)
                cd ..\src

diff --git a/src/makefile.nt b/src/makefile.nt
index 621d23818e1022f8a167eb4cbb3a81dbdf499475..b4fe21fb1393df12513b06192f68e8dfa22e50d1 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -163,7 +163,7 @@ paths.h:    ..\nt\paths.h
 #
 DOC            = obj\etc\DOC-X
 $(DOC):;       cd ..\lib-src 
-               - del DOC-X
+               - $(DEL) DOC-X
                $(MAKE) -f makefile.nt all
                cd ..\src
 
@@ -230,7 +230,7 @@ install:        all
 #
 # Maintenance
 # 
-clean:;         - del *~ *.pdb config.h paths.h
+clean:;         - $(DEL) *~ *.pdb config.h paths.h
                - $(DEL_TREE) deleted
                - $(DEL_TREE) obj
 
@@ -239,7 +239,7 @@ clean:;         - del *~ *.pdb config.h paths.h
 # this target is mostly used for debugging.
 #
 cleandump:;     cd $(BLD)
-               - del callproc.obj data.obj dispnew.obj doc.obj editfns.obj emacs.obj lread.obj process.obj sysdep.obj term.obj ntheap.obj unexnt.obj
+               - $(DEL) callproc.obj data.obj dispnew.obj doc.obj editfns.obj emacs.obj lread.obj process.obj sysdep.obj term.obj ntheap.obj unexnt.obj
                cd ..\..