* Makefile.in (install-arch-indep): Combine install-data, install-info loops.

2 files changed, 7 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index eda8c04f086..e52b39b05ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install-arch-indep):
+        Combine adjacent install-data and install-info loops.
+
 2012-05-01  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (MAN_PAGES): Remove.
diff --git a/Makefile.in b/Makefile.in
index a6dd44afa24..b7ec97c3c9d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -623,18 +623,10 @@ install-arch-indep: mkdir info install-etc
                   ${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}; \