* Makefile.in (install-arch-indep): Remove unneeded subshell.

Combine some rm commands.

diff --git a/ChangeLog b/ChangeLog
index 3a442429bc9279dfbf18be5e73efb0f8677b115c..c1dfe02c0eeb775293499ff8b4cea83902dca049 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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 d93efc677901ce188e9ac0882699d756fca0a772..f11a8b3ed060be4838a8b37f1e476b5ba0e7e403 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -525,24 +525,20 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
            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}