Command substitution already runs in a subshell

* Makefile.in (install-arch-indep, install-doc, install-info, uninstall):
* leim/Makefile.in (leim-list.el, install):
* lib-src/Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
* test/automated/Makefile.in (setwins):
Scrap superfluous subshells.

diff --git a/ChangeLog b/ChangeLog
index 56326b34ddb28fb70e8f775da3e202af95f0175e..9cc5e493dd0b9171a61331bf86d36deee044942a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install-arch-indep, install-doc, install-info)
+       (uninstall): Scrap superfluous subshells.
+
 2012-05-19  Ulrich Mueller  <ulm@gentoo.org>
 
        * Makefile.in (install-etc): Respect DESTDIR.  (Bug#11518)

diff --git a/Makefile.in b/Makefile.in
index ec74a2ec8a940e0e00eed5e6cb39fa25a73eb07e..90afd2310dd06fc3c2cef66fdb3ac26ecf664f1a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -529,7 +529,7 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
          [ -d $${dir} ] || exit 1 ; \
          dest=$$1 ; shift ; \
          [ -d $${dest} ] && \
-           [ `(cd $${dest} && /bin/pwd)` = `(cd $${dir} && /bin/pwd)` ] && \
+           [ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \
            continue ; \
          rm -rf $${dest} ; \
          umask 022; ${MKDIR_P} $${dest} ; \
@@ -578,7 +578,7 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
 install-doc: install-arch-indep
        -unset CDPATH; \
        umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
-       if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
+       if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
        then \
           fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
           if [ -f "./etc/DOC-$${fullversion}" ]; \
@@ -597,7 +597,7 @@ install-info: info
        umask 022; ${MKDIR_P} $(DESTDIR)${infodir}
        -unset CDPATH; \
        thisdir=`/bin/pwd`; \
-       [ `(cd ${srcdir}/info && /bin/pwd)` = `(cd $(DESTDIR)${infodir} && /bin/pwd)` ] || \
+       [ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} && /bin/pwd` ] || \
          (cd $(DESTDIR)${infodir};  \
           [ -f dir ] || \
             (cd $${thisdir}; \
@@ -670,8 +670,8 @@ uninstall:
        -unset CDPATH; \
        for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do        \
          if [ -d $${dir} ]; then                       \
-           case `(cd $${dir} ; /bin/pwd)` in           \
-             `(cd ${srcdir} ; /bin/pwd)`* ) ;;         \
+           case `cd $${dir} ; /bin/pwd` in             \
+             `cd ${srcdir} ; /bin/pwd`* ) ;;           \
              * ) rm -rf $${dir} ;;                     \
            esac ;                                      \
            case $${dir} in                             \

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 560e1d53da6a53b06d6cfa6800305592876cf244..b2fa25b2d2e9abc6493c0f1ad94373500f2cdf04 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (leim-list.el, install): Scrap superfluous subshells.
+
 2012-05-12  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (MKDIR_P): New, set by configure.

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 646102eee714d7c8a861b158836fa214b8273804..2e488197b2af54675c187b6accf5afe8c21e266b 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -157,7 +157,7 @@ changed.misc: ${SUBDIRS} ${MISC_SOURCES}
 
 leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el
        rm -f leim-list.el
-       if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+       if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
          ${RUN_EMACS} -l ${buildlisppath}/international/quail \
            --eval "(update-leim-list-file \".\")" ; \
        else \
@@ -191,11 +191,11 @@ compile-main: ${TIT_MISC}
 
 install: all
        umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR}
-       if [ x`(cd ${LEIM_INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
+       if [ x`cd ${LEIM_INSTALLDIR} && /bin/pwd` != x`/bin/pwd` ] ; then \
          rm -f ${LEIM_INSTALLDIR}/leim-list.el; \
          rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \
          echo "Copying leim files to ${LEIM_INSTALLDIR} ..." ; \
-         if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+         if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
            tar -chf - leim-list.el quail ja-dic \
                | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
          else \

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d0e9e5c525a6a33884812b6b48247f27b3238d17..1b4cd548a9970cff4ac0c1884d658fd26bd42aff 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
+       Scrap superfluous subshells.
+
 2012-05-18  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (install): Ensure $bindir exists.

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index fd423212c9fbee1de309f1065ad2f351b9aa5fbb..4e47e2e0bc6cf19209d1118698bfb7280e637d9a 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -190,7 +190,7 @@ $(EXE_FILES): ../lib/libgnu.a
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
 ## Nothing to do if pwd = srcdir.
-insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
+insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ]
 
 stamp-rcs2log: $(srcdir)/rcs2log
        $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
@@ -237,7 +237,7 @@ $(DESTDIR)${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
        umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
-       if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+       if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
          done ; \
@@ -249,8 +249,8 @@ $(DESTDIR)${archlibdir}: all
          chown ${gameuser} $(DESTDIR)${gamedir}; \
          chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
        fi
-       if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
-             != `(cd ${srcdir} && /bin/pwd)` ]; then \
+       if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
+             != `cd ${srcdir} && /bin/pwd` ]; then \
          for file in ${SCRIPTS}; do \
            $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
          done ; \

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b311fc4fcaaf238e9112af82dde7552a4745cb23..78f0e3863271b7d822cc82ac6f84221038cf6e95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+       Scrap superfluous subshells.
+
 2012-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/bytecomp.el (byte-compile-root-dir): New var.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d2c4e615577cea941989a3cda79ce64a2c7fc2c7..ff211589f497984075b159c5f0ade47ea48250d8 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -106,7 +106,7 @@ COMPILE_FIRST = \
 emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
-setwins=subdirs=`(find . -type d -print)`; \
+setwins=subdirs=`find . -type d -print`; \
        for file in $$subdirs; do \
           case $$file in */.* | */.*/* | */=* ) ;; \
                *) wins="$$wins $$file" ;; \
@@ -114,7 +114,7 @@ setwins=subdirs=`(find . -type d -print)`; \
         done
 
 # Find all subdirectories except `obsolete' and `term'.
-setwins_almost=subdirs=`(find . -type d -print)`; \
+setwins_almost=subdirs=`find . -type d -print`; \
        for file in $$subdirs; do \
           case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \
                *) wins="$$wins $$file" ;; \
@@ -122,7 +122,7 @@ setwins_almost=subdirs=`(find . -type d -print)`; \
         done
 
 # Find all subdirectories in which we might want to create subdirs.el
-setwins_for_subdirs=subdirs=`(find . -type d -print)`; \
+setwins_for_subdirs=subdirs=`find . -type d -print`; \
        for file in $$subdirs; do \
           case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \
                *) wins="$$wins $$file" ;; \

diff --git a/test/ChangeLog b/test/ChangeLog
index f05c94152a3883850b6dedcbaff77faf59935a25..ba6162ca241f7c284b75066f49036b6cc5bad67f 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * automated/Makefile.in (setwins): Scrap superfluous subshell.
+
 2012-05-15  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * automated/url-util-tests.el: New file to test

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index c07d5a1897d51d1f98d361dbc8330982f78b189f..4f2e8a59e49a00e0e5a3ca4b9c991cbc815b97d8 100644 (file)
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -48,7 +48,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
 emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
-setwins=subdirs=`(find . -type d -print)`; \
+setwins=subdirs=`find . -type d -print`; \
        for file in $$subdirs; do \
           case $$file in */.* | */.*/* | */=* ) ;; \
                *) wins="$$wins $$file" ;; \