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.

1 files changed, 4 insertions, 2 deletions

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 6839b28b975..a669ffd27be 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -245,9 +245,11 @@ CP_DIR		= cp -rf
 DEL             = rm
 DEL_TREE        = rm -r
 
+DIRNAME         = $(notdir $(CURDIR))
+
 ifdef USING_SH
 
-IFNOTSAMEDIR    = if [ ! -s ../same-dir.tst ] ; then
+IFNOTSAMEDIR    = if [ ! -s ../$(DIRNAME)_same-dir.tst ] ; then
 FOREACH         = for f in
 FORVAR          = $${f}
 FORDO           = ; do
@@ -262,7 +264,7 @@ endif
 
 else
 
-IFNOTSAMEDIR    = if not exist ../same-dir.tst
+IFNOTSAMEDIR    = if not exist ../$(DIRNAME)_same-dir.tst
 FOREACH         = for %%f in (
 FORVAR          = %%f
 FORDO           = ) do