[Emacs-diffs] /srv/bzr/emacs/trunk r108089: * Makefile.in (install-arch-indep): Combine install-data, install-info loops.

[Glenn Morris]

------------------------------------------------------------
revno: 108089
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-01 22:10:43 -0400
message:
  * Makefile.in (install-arch-indep): Combine install-data, install-info loops.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-01 21:05:28 +0000
+++ b/ChangeLog 2012-05-02 02:10:43 +0000
@@ -1,3 +1,8 @@
+2012-05-02  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-arch-indep):
+       Combine adjacent install-data and install-info loops.
+
 2012-05-01  Glenn Morris  <address@hidden>
 
        * Makefile.in (MAN_PAGES): Remove.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-01 21:05:28 +0000
+++ b/Makefile.in       2012-05-02 02:10:43 +0000
@@ -623,18 +623,10 @@
                  ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
                else true; fi; \
              done; \
+            (cd $${thisdir}; \
+             ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} 
$(DESTDIR)${infodir}/$$elt); \
           done); \
        else true; fi
-       -unset CDPATH; \
-       thisdir=`/bin/pwd`; \
-       if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && 
/bin/pwd)` ]; \
-       then \
-         for elt in $(INFO_FILES); do \
-           test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
-           (cd $${thisdir}; \
-            ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} 
$(DESTDIR)${infodir}/$$elt); \
-         done; \
-       else true; fi
        -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
        thisdir=`/bin/pwd`; \
        cd ${mansrcdir}; \