Tweak dependencies in top-level install rules

* Makefile.in (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.

diff --git a/ChangeLog b/ChangeLog
index 332ee011bd1c49f3fd3d642a94dc56ddb6b2a4f6..f6f13a4f07cfc57a5ecc4196cea4bb2c786b91dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-18  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (install-arch-dep): Depend on install-arch-indep.
+       (install-arch-indep): Depend on install-leim.
+       (install): Remove explicit install-leim dependence.
+
        * Makefile.in (install-arch-indep):
        Move last element of mkdir rule here.
        (mkdir): Remove rule.

diff --git a/Makefile.in b/Makefile.in
index 7a4ee5e4a5d3c2a2225f40346420903e43cde262..bfd8727f56cc32080a757996a727de19a4e65b31 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,9 +446,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
 
 .PHONY: install
 
-### We do install-arch-indep first because
-### the executable needs the Lisp files and DOC file to work properly.
-install: all install-arch-indep install-arch-dep install-leim blessmail
+install: all install-arch-indep install-arch-dep blessmail
        @true
 
 ## Ensure that $subdir contains a subdirs.el file.
@@ -467,11 +465,9 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
        fi
 
 ### Install the executables that were compiled specifically for this machine.
-### It would be nice to do something for a parallel make
-### to ensure that install-arch-indep finishes before this starts.
-### (TODO Why would it be nice?  Why not just make this depend on
-### install-arch-indep then?)
-install-arch-dep:
+### We do install-arch-indep first because the executable needs the
+### Lisp files and DOC file to work properly.
+install-arch-dep: install-arch-indep
        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
        (cd lib-src; \
          $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -540,7 +536,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 ## Is it really Emacs's job to create those directories?
 ## Should we also be ensuring they contain subdirs.el files?
 ## It would be easy to do, just use write_subdir.
-install-arch-indep: info install-etc
+install-arch-indep: info install-etc install-leim
        umask 022 ; \
          $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
        -set ${COPYDESTS} ; \