[Emacs-diffs] trunk r114787: Avoid non-portable "` ... \"...\" ... `" nesting

[Glenn Morris]

------------------------------------------------------------
revno: 114787
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-24 19:04:33 -0400
message:
  Avoid non-portable "` ... \"...\" ... `" nesting
  
  * configure.ac:
  * Makefile.in (install-arch-indep, install-etcdoc, install-info):
  * lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
  * nt/Makefile.in ($(DESTDIR)${archlibdir}):
  Avoid non-portable "`\" nesting.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/Makefile.in            makefile.in-20091113204419-o5vbwnq5f7feedwu-475
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/Makefile.in                 makefile.in-20130401120038-v7du7ljz2h0zkbc6-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-24 02:15:16 +0000
+++ b/ChangeLog 2013-10-24 23:04:33 +0000
@@ -1,5 +1,9 @@
 2013-10-24  Glenn Morris  <address@hidden>
 
+       * configure.ac:
+       * Makefile.in (install-arch-indep, install-etcdoc, install-info):
+       Avoid non-portable "`\" nesting.
+
        * configure.ac (CPPFLAGS) [mingw32]: Use abs_top_srcdir.
 
        * Makefile.in (abs_top_srcdir): New, set by configure.

=== modified file 'Makefile.in'
--- a/Makefile.in       2013-10-24 04:05:54 +0000
+++ b/Makefile.in       2013-10-24 23:04:33 +0000
@@ -571,9 +571,11 @@
        for dir in ${COPYDIR} ; do \
          [ -d $${dir} ] || exit 1 ; \
          dest="$$1" ; shift ; \
-         [ -d "$${dest}" ] && \
-           [ "`cd \"$${dest}\" && /bin/pwd`" = "`cd $${dir} && /bin/pwd`" ] && 
\
-           continue ; \
+         if [ -d "$${dest}" ]; then \
+           exp_dest=`cd "$${dest}" && /bin/pwd`; \
+           [ "$$exp_dest" = "`cd $${dir} && /bin/pwd`" ] && continue ; \
+         else true; \
+         fi; \
          if [ "$${dir}" = "leim/quail" ]; then \
            [ "`cd $${dir} && /bin/pwd`" = "`cd ${srcdir}/leim/quail && 
/bin/pwd`" ] && \
              continue ; \
@@ -623,7 +625,8 @@
              cd "$${thisdir}" ; \
              cd "$${dir}" || exit 1 ; \
              for f in `find . -name "*.elc" -print`; do \
-               ${GZIP_PROG} -9n "`echo \"$$f\" | sed 's/.elc$$/.el/'`" ; \
+               f_el=`echo "$$f" | sed 's/.elc$$/.el/'`; \
+               ${GZIP_PROG} -9n "$$f_el" ; \
              done ; \
            done )
        -chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS}
@@ -637,7 +640,8 @@
 install-etcdoc: src install-arch-indep
        -unset CDPATH; \
        umask 022; ${MKDIR_P} "$(DESTDIR)${etcdocdir}" ; \
-       if [ "`cd ./etc; /bin/pwd`" != "`cd \"$(DESTDIR)${etcdocdir}\"; 
/bin/pwd`" ]; \
+       exp_etcdocdir=`cd "$(DESTDIR)${etcdocdir}"; /bin/pwd`; \
+       if [ "`cd ./etc; /bin/pwd`" != "$$exp_etcdocdir" ]; \
        then \
           docfile="DOC"; \
           echo "Copying etc/$${docfile} to $(DESTDIR)${etcdocdir} ..." ; \
@@ -650,7 +654,8 @@
        umask 022; ${MKDIR_P} "$(DESTDIR)${infodir}"
        -unset CDPATH; \
        thisdir=`/bin/pwd`; \
-       if [ "`cd ${srcdir}/info && /bin/pwd`" = "`cd \"$(DESTDIR)${infodir}\" 
&& /bin/pwd`" ]; then \
+       exp_infodir=`cd "$(DESTDIR)${infodir}" && /bin/pwd`; \
+       if [ "`cd ${srcdir}/info && /bin/pwd`" = "$$exp_infodir" ]; then \
          true; \
        else \
          (cd "$(DESTDIR)${infodir}"; \

=== modified file 'configure.ac'
--- a/configure.ac      2013-10-24 02:15:16 +0000
+++ b/configure.ac      2013-10-24 23:04:33 +0000
@@ -78,7 +78,14 @@
 dnl because the latter by default is not yet expanded, but the user
 dnl may have specified a value for it via --bindir.
 dnl Note that abs_srcdir and abs_builddir are not yet defined. :(
-for var in "`pwd`" "`cd \"$srcdir\"; pwd`" "$prefix" "$exec_prefix" \
+
+dnl "`cd \"$srcdir\" is not portable.
+dnl See autoconf manual "Shell Substitutions":
+dnl "There is just no portable way to use double-quoted strings inside
+dnl double-quoted back-quoted expressions (pfew!)."
+temp_srcdir=`cd "$srcdir"; pwd`
+
+for var in "`pwd`" "$temp_srcdir" "$prefix" "$exec_prefix" \
     "$datarootdir" "$bindir" "$datadir" "$sharedstatedir" "$libexecdir"; do
 
   dnl configure sets LC_ALL=C early on, so this range should work.

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2013-10-24 02:15:16 +0000
+++ b/lib-src/ChangeLog 2013-10-24 23:04:33 +0000
@@ -1,5 +1,8 @@
 2013-10-24  Glenn Morris  <address@hidden>
 
+       * Makefile.in ($(DESTDIR)${archlibdir}):
+       Avoid non-portable "`\" nesting.
+
        * Makefile.in (abs_top_srcdir): New, set by configure.
 
 2013-10-23  Glenn Morris  <address@hidden>

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2013-10-24 04:05:54 +0000
+++ b/lib-src/Makefile.in       2013-10-24 23:04:33 +0000
@@ -234,7 +234,8 @@
        @echo
        @echo "Installing utilities run internally by Emacs."
        umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
-       if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" != "`/bin/pwd`" ]; 
then \
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+       if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file 
"$(DESTDIR)${archlibdir}/$$file" ; \
          done ; \

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-10-24 02:15:16 +0000
+++ b/nt/ChangeLog      2013-10-24 23:04:33 +0000
@@ -1,5 +1,8 @@
 2013-10-24  Glenn Morris  <address@hidden>
 
+       * Makefile.in ($(DESTDIR)${archlibdir}):
+       Avoid non-portable "`\" nesting.
+
        * Makefile.in (abs_top_srcdir): New, set by configure.
 
 2013-10-23  Glenn Morris  <address@hidden>

=== modified file 'nt/Makefile.in'
--- a/nt/Makefile.in    2013-10-24 04:05:54 +0000
+++ b/nt/Makefile.in    2013-10-24 23:04:33 +0000
@@ -144,7 +144,8 @@
        @echo
        @echo "Installing utilities run internally by Emacs."
        umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
-       if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" != "`/bin/pwd`" ]; 
then \
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+       if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file 
"$(DESTDIR)${archlibdir}/$$file" ; \
          done ; \