Undo part of previous change, in case it makes command line too long

diff --git a/ChangeLog b/ChangeLog
index 3ed2fb71a25241511545b221841aa60224ad8ff1..7e98201cc613981a7e1868c39eddeff1d45bc009 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@
 2012-05-19  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (install-arch-indep): Remove unneeded subshell.
-       Combine some rm commands.
 
        * Makefile.in (install-arch-indep): Remove unneeded chmod.
        Set permissions of lisp/subdirs.el.

diff --git a/Makefile.in b/Makefile.in
index f11a8b3ed060be4838a8b37f1e476b5ba0e7e403..74111dc8348aa1cc4755884027eec09fd48a2703 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -531,12 +531,16 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
               tar -xvf - && cat > /dev/null) || exit 1; \
          [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
          for subdir in `find $${dest} -type d -print` ; do \
-           rm -f $${subdir}/.gitignore $${subdir}/.arch-inventory \
-             $${subdir}/.DS_Store  $${subdir}/ChangeLog* \
-             $${subdir}/\#*        $${subdir}/.\#*  \
-             $${subdir}/*~         $${subdir}/*.orig ; \
+           rm -f $${subdir}/.gitignore ; \
+           rm -f $${subdir}/.arch-inventory ; \
+           rm -f $${subdir}/.DS_Store ; \
+           rm -f $${subdir}/\#* ; \
+           rm -f $${subdir}/.\#* ; \
+           rm -f $${subdir}/*~ ; \
+           rm -f $${subdir}/*.orig ; \
+           rm -f $${subdir}/ChangeLog* ; \
            [ "$${dir}" != "${srcdir}/etc" ] && \
-            rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
+             rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
          done ; \
          find $${dest} -exec chown $${installuser} {} ';' ;\
        done