[Emacs-diffs] /srv/bzr/emacs/trunk r108312: Undo part of previous change, in case it makes command line too long

[Glenn Morris]

------------------------------------------------------------
revno: 108312
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-19 11:47:39 -0700
message:
  Undo part of previous change, in case it makes command line too long
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-19 18:04:49 +0000
+++ b/ChangeLog 2012-05-19 18:47:39 +0000
@@ -11,7 +11,6 @@
 2012-05-19  Glenn Morris  <address@hidden>
 
        * 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.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-19 07:20:16 +0000
+++ b/Makefile.in       2012-05-19 18:47:39 +0000
@@ -531,12 +531,16 @@
               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