aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2012-03-25 20:17:46 +0200
committerEli Zaretskii2012-03-25 20:17:46 +0200
commite5a69fd00a424f59f2ef7be8049b47340ddaa1ca (patch)
tree23541145e69bc2288d2a931f4b4c9d66c35db67d /lisp/ChangeLog
parentbf43fa51a6aabd68659c90eeb42a1b214820ea4a (diff)
downloademacs-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 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6220b11be7..5a0c33da3c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-03-25 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
4 of same-dir.tst, to avoid stepping on other (parallel) Make job's
5 toes.
6
12012-03-25 Chong Yidong <cyd@gnu.org> 72012-03-25 Chong Yidong <cyd@gnu.org>
2 8
3 * custom.el (load-theme): Even if NO-ENABLE arg is t, reenable the 9 * custom.el (load-theme): Even if NO-ENABLE arg is t, reenable the