[Emacs-diffs] emacs-24 r117030: * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Avoid non-portable "`\" nesting

[Glenn Morris]

------------------------------------------------------------
revno: 117030
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17339
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-29 07:54:58 -0700
message:
  * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Avoid non-portable "`\" 
nesting
modified:
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/Makefile.in            makefile.in-20091113204419-o5vbwnq5f7feedwu-475

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-04-16 13:27:28 +0000
+++ b/lib-src/ChangeLog 2014-04-29 14:54:58 +0000
@@ -1,3 +1,8 @@
+2014-04-29  Glenn Morris  <address@hidden>
+
+       * Makefile.in ($(DESTDIR)${archlibdir}):
+       Avoid non-portable "`\" nesting.  (Bug#17339)
+
 2014-04-16  Eli Zaretskii  <address@hidden>
 
        * update-game-score.c (write_scores): Condition fchmod call on

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2014-01-05 02:56:08 +0000
+++ b/lib-src/Makefile.in       2014-04-29 14:54:58 +0000
@@ -247,8 +247,8 @@
          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 \
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+       if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
          for file in ${SCRIPTS}; do \
            $(INSTALL_SCRIPT) ${srcdir}/$$file 
"$(DESTDIR)${archlibdir}/$$file"; \
          done ; \