]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf43fa5)
Fix parallel "make install" on MS-Windows.
authorEli Zaretskii <eliz@gnu.org>
Sun, 25 Mar 2012 18:17:46 +0000 (20:17 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 25 Mar 2012 18:17:46 +0000 (20:17 +0200)
 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.

leim/ChangeLog patch | blob | history
leim/makefile.w32-in patch | blob | history
lisp/ChangeLog patch | blob | history
lisp/makefile.w32-in patch | blob | history
nt/ChangeLog patch | blob | history
nt/gmake.defs patch | blob | history
nt/makefile.w32-in patch | blob | history
nt/nmake.defs patch | blob | history

diff --git a/leim/ChangeLog b/leim/ChangeLog
index fe7597a0ebe08e2c36f9a434ff997b66be066b01..ed9ff6f92709a75f7400ec24939eb3a144e8b478 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/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-21  Kenichi Handa  <handa@m17n.org>
 
        * quail/indian.el ("devanagari-itrans"): Add a few more useful
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 19ccaf4f62bb36247c55fa5bd7bbfe6efbe7b832..e9a56e79f73210a50e367e1c5c8b3374b6e17a8c 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -201,13 +201,13 @@ leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el
 
 install: all
        - mkdir "$(INSTALLDIR)"
-       - $(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
        $(IFNOTSAMEDIR) $(CP) leim-list.el $(INSTALLDIR) $(ENDIF)
        $(IFNOTSAMEDIR) $(CP_DIR) quail $(INSTALLDIR) $(ENDIF)
        $(IFNOTSAMEDIR) $(CP_DIR) ja-dic $(INSTALLDIR) $(ENDIF)
-       - $(DEL) $(INSTALL_DIR)/same-dir.tst
+       - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
 
 clean mostlyclean:
        - $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6220b11be76c1b044aefcdaa1bfde89af39ded5..5a0c33da3c88b1056714aec4085c32d09ea3776b 100644 (file)
--- 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 33c87778dfd16f85912fe2ab04a6255cd10879b6..7907c5f10ceca25375f83f3ccfe11f8389264b0b 100644 (file)
--- 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
diff --git a/nt/ChangeLog b/nt/ChangeLog
index e53588412740cdda7a133f12ed5822335a90f9ee..5c494578eeb5e76d274d02f8aa30f850c590168d 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,23 @@
+2012-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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.
+
+       * nmake.defs (DIRNAME): New variable.
+       (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
+       same-dir.tst.
+
+       * gmake.defs (DIRNAME): New variable.
+       (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of
+       same-dir.tst, to avoid conflicts between several (parallel) Make
+       jobs.
+
 2012-02-24  Eli Zaretskii  <eliz@gnu.org>
 
        Prevent endless re-spawning of cmdproxy.exe when some of its
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 6839b28b97550228ba3edf3ca1557de4536ac9a4..a669ffd27be0dcc9103bcfbea92dc0e72ffb6bbd 100644 (file)
--- 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
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 10fe6db1ccfe39f0a65d917c33e00397cf38fe02..8075f6cb3ef9650d535b0507e26beb5ad391c02b 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -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,21 +247,22 @@ 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
        fi\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
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 2cb3113ca9ad601f274d8f0dfa51ed08a2d5e0ec..11079b4fb7d8f922344d00f90e17dddc372c81e1 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -27,6 +27,7 @@ MAKETYPE=nmake
 \r
 CURDIR         = $(MAKEDIR:\=/)\r
 THISDIR                = $(MAKEDIR)\r
+DIRNAME                =\r
 \r
 ALL_DEPS       = $**\r
 \r
@@ -181,7 +182,7 @@ COMPILER_TEMP_FILES = *.pdb
 \r
 CP             = cp -f\r
 CP_DIR         = cp -rf\r
-IFNOTSAMEDIR   = if not exist ..\same-dir.tst\r
+IFNOTSAMEDIR   = if not exist ..\$(DIRNAME)_same-dir.tst\r
 ENDIF          =\r
 FOREACH                = for %%f in (\r
 FORVAR         = %%f\r