Fix parallel "make install" on MS-Windows.

[gnu-emacs] / nt / makefile.w32-in

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 30a5f83ea000604e8d58f58e7219070460f0fc97..8075f6cb3ef9650d535b0507e26beb5ad391c02b 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -22,7 +22,7 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out\r
 #        (and remove or replace this comment).\r
 \r
-VERSION                = 24.0.93\r
+VERSION                = 24.0.94\r
 \r
 TMP_DIST_DIR   = emacs-$(VERSION)\r
 \r
@@ -214,14 +214,13 @@ $(INSTALL_DIR)/bin: $(INSTALL_DIR)
 install: install-bin install-shortcuts\r
 \r
 install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)\r
-       - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin\r
        - $(CP) README.W32 $(INSTALL_DIR)\r
-       - $(DEL) ../same-dir.tst\r
-       - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
-       echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"\r
+       - $(DEL) ../$(DIRNAME)_same-dir.tst\r
+       - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst\r
+       echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"\r
        - mkdir "$(INSTALL_DIR)/etc"\r
        - mkdir "$(INSTALL_DIR)/info"\r
        - mkdir "$(INSTALL_DIR)/lock"\r
@@ -234,10 +233,10 @@ install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
        $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF)\r
        $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF)\r
        - $(CP) ../COPYING $(INSTALL_DIR)/bin\r
-       - $(DEL) ../same-dir.tst\r
-       - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
+       - $(DEL) ../$(DIRNAME)_same-dir.tst\r
+       - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst\r
 \r
-install-other-dirs-nmake:\r
+install-other-dirs-nmake: all\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) install\r
        cd ..\src\r
@@ -248,23 +247,24 @@ install-other-dirs-nmake:
        $(MAKE) $(MFLAGS) install\r
        cd ..\nt\r
 \r
-install-other-dirs-gmake:\r
+install-other-dirs-gmake: all\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install\r
 \r
-install-shortcuts:\r
+install-shortcuts: $(INSTALL_DIR)/bin\r
+       - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin\r
        "$(INSTALL_DIR)/bin/addpm" -q\r
 \r
 maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)\r
 \r
-maybe-copy-distfiles-CMD: doit\r
+maybe-copy-distfiles-CMD: create-tmp-dist-dir doit\r
        @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin\r
 \r
-maybe-copy-distfiles-SH: doit\r
+maybe-copy-distfiles-SH: create-tmp-dist-dir doit\r
        @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \\r
-         $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin\r
+         $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \\r
        fi\r
 \r
 create-tmp-dist-dir:\r
@@ -272,7 +272,7 @@ create-tmp-dist-dir:
 # Also create bin directory for dist files.\r
        mkdir "$(TMP_DIST_DIR)/bin"\r
 \r
-dist: install-bin create-tmp-dist-dir maybe-copy-distfiles\r
+dist: install-bin maybe-copy-distfiles\r
        $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)\r
        $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)\r
        $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)\r