aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-19 12:04:50 -0700
committerGlenn Morris2012-05-19 12:04:50 -0700
commit41a2ce39fa914487fb649edaea1a5e2a8f886bc6 (patch)
tree19447915bf343af3bd638d63763aeb6838f1ff16
parentaf006ad50e088b8e2f715a1778fa4caa3ab28d8f (diff)
downloademacs-41a2ce39fa914487fb649edaea1a5e2a8f886bc6.tar.gz
emacs-41a2ce39fa914487fb649edaea1a5e2a8f886bc6.zip
Comments
-rw-r--r--Makefile.in6
-rw-r--r--leim/Makefile.in4
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 6e0f8703d06..acaafcd23ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -511,6 +511,12 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
511## Is it really Emacs's job to create those directories? 511## Is it really Emacs's job to create those directories?
512## Should we also be ensuring they contain subdirs.el files? 512## Should we also be ensuring they contain subdirs.el files?
513## It would be easy to do, just use write_subdir. 513## It would be easy to do, just use write_subdir.
514
515## Note that we use tar instead of plain old cp -R/-r because the latter
516## is apparently not portable (even in 2012!).
517## http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00278.html
518## I have no idea which platforms Emacs supports where cp -R does not
519## work correctly, and therefore no idea when tar can be replaced.
514install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} 520install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
515 umask 022 ; \ 521 umask 022 ; \
516 $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` 522 $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 54ed0ad35fe..646102eee71 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -131,7 +131,9 @@ ${CHINESE_TIT}: changed.tit
131## Otherwise in a parallel build multiple Emacs instances could 131## Otherwise in a parallel build multiple Emacs instances could
132## interfere with each other. If we used GNU make we could probably 132## interfere with each other. If we used GNU make we could probably
133## parallelize this without the need for an explicit rule for each 133## parallelize this without the need for an explicit rule for each
134## file. 134## file. Something like the pattern rule:
135## quail/%.el: CXTERM-DIC/%.tit
136## It doesn't seem possible to do this with VPATH and suffix rules.
135changed.tit: ${SUBDIRS} ${TIT_SOURCES} 137changed.tit: ${SUBDIRS} ${TIT_SOURCES}
136 ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ 138 ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
137 -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ 139 -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \