[MAIL_USE_POP]: Add the "-r" flag to reverse the

[gnu-emacs] / nt / makefile.nt

diff --git a/nt/makefile.nt b/nt/makefile.nt
index e173f73083388da717f074ea736d1434d2818cbf..ab1dd5b7fe90422666547e3500ac28d9a02621d0 100644 (file)
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -83,24 +83,30 @@ all:                $(BLD) $(ALL)
                $(BUILD_CMD)
                cd ..\nt
 
+$(INSTALL_DIR)\bin:
+               - mkdir $(INSTALL_DIR)\bin
 
-emacs.bat:     emacs.bat.in
-               echo @echo off > emacs.bat
+$(INSTALL_DIR)\bin\emacs.bat:  emacs.bat.in
+               echo @echo off > $@
                echo REM !!! Warning: This file automatically generated !!! >> emacs.bat
-               echo set emacs_dir=$(INSTALL_DIR)>> emacs.bat
-               type emacs.bat.in >> emacs.bat
+               echo set emacs_dir=$(INSTALL_DIR)>> $@
+               type emacs.bat.in >> $@
 
-debug.bat:     debug.bat.in
-               echo @echo off > debug.bat
+$(INSTALL_DIR)\bin\debug.bat:  debug.bat.in
+               echo @echo off > $@
                echo REM !!! Warning: This file automatically generated !!! >> debug.bat
-               echo set emacs_dir=$(INSTALL_DIR)>> debug.bat
-               type debug.bat.in >> debug.bat
+               echo set emacs_dir=$(INSTALL_DIR)>> $@
+               type debug.bat.in >> $@
+
+batch_files: $(INSTALL_DIR)\bin \
+            $(INSTALL_DIR)\bin\emacs.bat \
+            $(INSTALL_DIR)\bin\debug.bat
 
 #
 # Build and install emacs in INSTALL_DIR
 #
 INSTALL_CMD    = $(MAKE) -f makefile.nt install
-install:       all emacs.bat debug.bat
+install:       all batch_files
                - mkdir $(INSTALL_DIR)
                cd ..\lib-src
                $(INSTALL_CMD)
@@ -109,8 +115,6 @@ install:    all emacs.bat debug.bat
                cd ..\lisp
                $(INSTALL_CMD)
                cd ..\nt                
-               - $(CP) emacs.bat $(INSTALL_DIR)\bin
-               - $(CP) debug.bat $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin
@@ -127,12 +131,10 @@ install:  all emacs.bat debug.bat
 # This installs executables from ..\bin into the installation directory
 # without building anything.
 #
-fast_install:
+fast_install:  batch_files
                - mkdir $(INSTALL_DIR)\data
                $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
                - mkdir $(INSTALL_DIR)\bin
-               - $(CP) emacs.bat $(INSTALL_DIR)\bin
-               - $(CP) debug.bat $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
                - $(DEL) ..\same-dir.tst