Fix parallel "make install" on MS-Windows.

 nt/makefile.w32-in (install-bin): Don't copy addpm.exe here.  Use
 $(DIRNAME)_same-dir.tst instead of same-dir.tst, to avoid stepping
 on other (parallel) Make job's toes.
 (install-other-dirs-nmake, install-other-dirs-gmake): Depend on `all'.
 (install-shortcuts): Depend on $(INSTALL_DIR)/bin.  Copy addpm.exe
 here.
 (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH, dist): Depend
 on create-tmp-dist-dir.
 nt/nmake.defs (DIRNAME): New variable.
 (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
 same-dir.tst.
 nt/gmake.defs (DIRNAME): New variable.
 (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
 same-dir.tst, to avoid conflicts between several (parallel) Make
 jobs.
 lisp/makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
 of same-dir.tst, to avoid stepping on other (parallel) Make job's
 toes.
 leim/makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
 of same-dir.tst, to avoid stepping on other (parallel) Make job's
 toes.

2 files changed, 11 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6220b11be7..5a0c33da3c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
+        of same-dir.tst, to avoid stepping on other (parallel) Make job's
+        toes.
+
 2012-03-25  Chong Yidong  <cyd@gnu.org>
 
         * custom.el (load-theme): Even if NO-ENABLE arg is t, reenable the
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 33c87778dfd..7907c5f10ce 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -510,9 +510,9 @@ bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
 #
 install:
                 - mkdir "$(INSTALL_DIR)/lisp"
-                - $(DEL) ../same-dir.tst
-                - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
-                echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
+                - $(DEL) ../$(DIRNAME)_same-dir.tst
+                - $(DEL) "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
+                echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
 #ifdef COPY_LISP_SOURCE
                 $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) install-lisp-$(SHELLTYPE) $(ENDIF)
 #else
@@ -528,8 +528,8 @@ install:
 #               $(IFNOTSAMEDIR) $(CP) international/latin-*.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)
 #               $(IFNOTSAMEDIR) $(CP) international/mule-conf.el "$(INSTALL_DIR)/lisp/international" $(ENDIF)
 #endif
-                - $(DEL) ../same-dir.tst
-                - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
+                - $(DEL) ../$(DIRNAME)_same-dir.tst
+                - $(DEL) "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
 
 # Need to copy *.el files first, to avoid "source file is newer" annoyance
 # since cp does not preserve time stamps