From b847032c75e0cb4041a8736886e7054beb6f8696 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 20 May 2012 17:44:34 -0700 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ Makefile.in | 10 +++++----- leim/ChangeLog | 4 ++++ leim/Makefile.in | 6 +++--- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 8 ++++---- lisp/ChangeLog | 5 +++++ lisp/Makefile.in | 6 +++--- test/ChangeLog | 4 ++++ test/automated/Makefile.in | 2 +- 10 files changed, 39 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56326b34ddb..9cc5e493dd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * Makefile.in (install-arch-indep, install-doc, install-info) + (uninstall): Scrap superfluous subshells. + 2012-05-19 Ulrich Mueller * Makefile.in (install-etc): Respect DESTDIR. (Bug#11518) diff --git a/Makefile.in b/Makefile.in index ec74a2ec8a9..90afd2310dd 100644 --- 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 560e1d53da6..b2fa25b2d2e 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2012-05-21 Glenn Morris + + * Makefile.in (leim-list.el, install): Scrap superfluous subshells. + 2012-05-12 Glenn Morris * Makefile.in (MKDIR_P): New, set by configure. diff --git a/leim/Makefile.in b/leim/Makefile.in index 646102eee71..2e488197b2a 100644 --- 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 d0e9e5c525a..1b4cd548a99 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}): + Scrap superfluous subshells. + 2012-05-18 Glenn Morris * Makefile.in (install): Ensure $bindir exists. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index fd423212c9f..4e47e2e0bc6 100644 --- 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 b311fc4fcaa..78f0e386327 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): + Scrap superfluous subshells. + 2012-05-19 Stefan Monnier * emacs-lisp/bytecomp.el (byte-compile-root-dir): New var. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index d2c4e615577..ff211589f49 100644 --- 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 f05c94152a3..ba6162ca241 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2012-05-21 Glenn Morris + + * automated/Makefile.in (setwins): Scrap superfluous subshell. + 2012-05-15 Teodor Zlatanov * automated/url-util-tests.el: New file to test diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index c07d5a1897d..4f2e8a59e49 100644 --- 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" ;; \ -- 2.39.2