Be more explicit about some Makefile dependencies

* Makefile.in (install-arch-dep, install-arch-indep, install-doc):
Be more explicit about dependencies, for parallel `make install'.

It is not so unreasonable to run `make -j# install' from a clean state
for a self-contained NS build, where the "installation" happens within
the build tree.

diff --git a/ChangeLog b/ChangeLog
index 3d6d5020b0c7f3c634b0cad4e6bf73d288c6b3ee..23fc479e124e5e3a8b05f933d80bed162bc674b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-11  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install-arch-dep, install-arch-indep, install-doc):
+       Be more explicit about dependencies, for parallel `make install'.
+
 2012-09-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify, document, and port floating-point (Bug#12381).

diff --git a/Makefile.in b/Makefile.in
index 800f11669d672da09f729a7f8b2c04c189b21e56..6ed32491a66ad4716c9aa498ab64eb740e2d7215 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -433,7 +433,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
 ### Install the executables that were compiled specifically for this machine.
 ### 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 install-doc
+install-arch-dep: src install-arch-indep install-doc
        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
        cd lib-src && \
          $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -502,7 +502,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 ## work correctly, and therefore no idea when tar can be replaced.
 ## See also these comments from 2004 about cp -r working fine:
 ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
-install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
+install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
        umask 022 ; \
        locallisppath='${locallisppath}'; \
        IFS=:; \
@@ -573,7 +573,7 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
 
 ## Note that install-arch-indep deletes and recreates the entire
 ## installed etc/ directory, so we need it to run before this does.
-install-doc: install-arch-indep
+install-doc: src install-arch-indep
        -unset CDPATH; \
        umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
        if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \