[Emacs-diffs] /srv/bzr/emacs/trunk r108306: * Makefile.in (install-arch-indep): Remove unneeded subshell.

[Glenn Morris]

------------------------------------------------------------
revno: 108306
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-19 00:20:16 -0700
message:
  * Makefile.in (install-arch-indep): Remove unneeded subshell.
  Combine some rm commands.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-19 06:45:24 +0000
+++ b/ChangeLog 2012-05-19 07:20:16 +0000
@@ -1,5 +1,8 @@
 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 06:45:24 +0000
+++ b/Makefile.in       2012-05-19 07:20:16 +0000
@@ -525,24 +525,20 @@
            continue ; \
          rm -rf $${dest} ; \
          umask 022; ${MKDIR_P} $${dest} ; \
-         (echo "Copying $${dir} to $${dest}..." ; \
-          (cd $${dir}; tar -chf - . ) \
-            | (cd $${dest}; umask 022; \
-               tar -xvf - && cat > /dev/null) || exit 1; \
-          [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
-          find $${dest} -exec chown $${installuser} {} ';' ;\
-          for subdir in `find $${dest} -type d -print` ; do \
-            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 ; \
-            [ "$${dir}" != "${srcdir}/etc" ] && \
-             rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
-            rm -f  $${subdir}/ChangeLog* ; \
-          done) ; \
+         echo "Copying $${dir} to $${dest}..." ; \
+         (cd $${dir}; tar -chf - . ) \
+           | (cd $${dest}; umask 022; \
+              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 ; \
+           [ "$${dir}" != "${srcdir}/etc" ] && \
+            rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
+         done ; \
+         find $${dest} -exec chown $${installuser} {} ';' ;\
        done
        -rm -f $(DESTDIR)${lispdir}/subdirs.el
        umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir}