diff options
| author | Eli Zaretskii | 2012-03-25 20:17:46 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-03-25 20:17:46 +0200 |
| commit | e5a69fd00a424f59f2ef7be8049b47340ddaa1ca (patch) | |
| tree | 23541145e69bc2288d2a931f4b4c9d66c35db67d /nt/ChangeLog | |
| parent | bf43fa51a6aabd68659c90eeb42a1b214820ea4a (diff) | |
| download | emacs-e5a69fd00a424f59f2ef7be8049b47340ddaa1ca.tar.gz emacs-e5a69fd00a424f59f2ef7be8049b47340ddaa1ca.zip | |
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 'nt/ChangeLog')
| -rw-r--r-- | nt/ChangeLog | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index e5358841274..5c494578eeb 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,23 @@ | |||
| 1 | 2012-03-25 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (install-bin): Don't copy addpm.exe here. Use | ||
| 4 | $(DIRNAME)_same-dir.tst instead of same-dir.tst, to avoid stepping | ||
| 5 | on other (parallel) Make job's toes. | ||
| 6 | (install-other-dirs-nmake, install-other-dirs-gmake): Depend on `all'. | ||
| 7 | (install-shortcuts): Depend on $(INSTALL_DIR)/bin. Copy addpm.exe | ||
| 8 | here. | ||
| 9 | (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH, dist): Depend | ||
| 10 | on create-tmp-dist-dir. | ||
| 11 | |||
| 12 | * nmake.defs (DIRNAME): New variable. | ||
| 13 | (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of | ||
| 14 | same-dir.tst. | ||
| 15 | |||
| 16 | * gmake.defs (DIRNAME): New variable. | ||
| 17 | (IFNOTSAMEDIR): Use $(DIRNAME)_same-dir.tst instead of | ||
| 18 | same-dir.tst, to avoid conflicts between several (parallel) Make | ||
| 19 | jobs. | ||
| 20 | |||
| 1 | 2012-02-24 Eli Zaretskii <eliz@gnu.org> | 21 | 2012-02-24 Eli Zaretskii <eliz@gnu.org> |
| 2 | 22 | ||
| 3 | Prevent endless re-spawning of cmdproxy.exe when some of its | 23 | Prevent endless re-spawning of cmdproxy.exe when some of its |