aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-09-11 00:45:38 -0700
committerGlenn Morris2012-09-11 00:45:38 -0700
commit9d9edd4baee38b48b7c33a22e25a3a5b8779e41a (patch)
tree72b0602dbf8796668a12c36bb14c4b9d5a83b3ee
parente578f3813ff7f48663eb4821caee267e3ec47aa8 (diff)
downloademacs-9d9edd4baee38b48b7c33a22e25a3a5b8779e41a.tar.gz
emacs-9d9edd4baee38b48b7c33a22e25a3a5b8779e41a.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d6d5020b0c..23fc479e124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-09-11 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (install-arch-dep, install-arch-indep, install-doc):
4 Be more explicit about dependencies, for parallel `make install'.
5
12012-09-11 Paul Eggert <eggert@cs.ucla.edu> 62012-09-11 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Simplify, document, and port floating-point (Bug#12381). 8 Simplify, document, and port floating-point (Bug#12381).
diff --git a/Makefile.in b/Makefile.in
index 800f11669d6..6ed32491a66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -433,7 +433,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
433### Install the executables that were compiled specifically for this machine. 433### Install the executables that were compiled specifically for this machine.
434### We do install-arch-indep first because the executable needs the 434### We do install-arch-indep first because the executable needs the
435### Lisp files and DOC file to work properly. 435### Lisp files and DOC file to work properly.
436install-arch-dep: install-arch-indep install-doc 436install-arch-dep: src install-arch-indep install-doc
437 umask 022; ${MKDIR_P} $(DESTDIR)${bindir} 437 umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
438 cd lib-src && \ 438 cd lib-src && \
439 $(MAKE) install $(MFLAGS) prefix=${prefix} \ 439 $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -502,7 +502,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
502## work correctly, and therefore no idea when tar can be replaced. 502## work correctly, and therefore no idea when tar can be replaced.
503## See also these comments from 2004 about cp -r working fine: 503## See also these comments from 2004 about cp -r working fine:
504## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html 504## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
505install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} 505install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
506 umask 022 ; \ 506 umask 022 ; \
507 locallisppath='${locallisppath}'; \ 507 locallisppath='${locallisppath}'; \
508 IFS=:; \ 508 IFS=:; \
@@ -573,7 +573,7 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
573 573
574## Note that install-arch-indep deletes and recreates the entire 574## Note that install-arch-indep deletes and recreates the entire
575## installed etc/ directory, so we need it to run before this does. 575## installed etc/ directory, so we need it to run before this does.
576install-doc: install-arch-indep 576install-doc: src install-arch-indep
577 -unset CDPATH; \ 577 -unset CDPATH; \
578 umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \ 578 umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
579 if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \ 579 if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \