diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-03-25 20:17:46 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-03-25 20:17:46 +0200 |
| commit | e5a69fd00a424f59f2ef7be8049b47340ddaa1ca (patch) | |
| tree | 23541145e69bc2288d2a931f4b4c9d66c35db67d /leim | |
| parent | bf43fa51a6aabd68659c90eeb42a1b214820ea4a (diff) | |
| download | emacs-e5a69fd00a424f59f2ef7be8049b47340ddaa1ca.tar.gz | |
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.
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 6 | ||||
| -rw-r--r-- | leim/makefile.w32-in | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index fe7597a0ebe..ed9ff6f9270 100644 --- 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 19ccaf4f62b..e9a56e79f73 100644 --- 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) |