[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108294: Fix up dependencies in previous change.

[Glenn Morris]

------------------------------------------------------------
revno: 108294
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-18 14:19:37 -0400
message:
  Fix up dependencies in previous change.
  install-arch-indep deletes the entire destination etc/ directory,
  so install-doc needs that to be run first.
modified:
  Makefile.in

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-18 17:56:08 +0000
+++ b/Makefile.in       2012-05-18 18:19:37 +0000
@@ -443,7 +443,7 @@
 
 .PHONY: install
 
-install: all install-arch-indep install-arch-dep blessmail
+install: all install-arch-indep install-doc install-arch-dep blessmail
        @true
 
 ## Ensure that $subdir contains a subdirs.el file.
@@ -464,7 +464,7 @@
 ### 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-arch-dep: install-arch-indep install-doc
        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
        (cd lib-src; \
          $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -523,7 +523,7 @@
 ## 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: install-leim install-doc install-info install-man 
${INSTALL_ARCH_INDEP_EXTRA}
+install-arch-indep: install-leim install-info install-man 
${INSTALL_ARCH_INDEP_EXTRA}
        umask 022 ; \
          $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
        -set ${COPYDESTS} ; \
@@ -582,7 +582,10 @@
 ## has another effect.  We copy the entire etc/ directory from the
 ## source tree first.  For an in-tree build, this will include
 ## any DOC* files there may be.  So rm DOC does have an effect.
-install-doc:
+
+## 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
        -unset CDPATH; \
        umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
        if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \