From: Glenn Morris <rgm@gnu.org>
Date: Tue, 29 Apr 2014 14:54:58 +0000 (-0700)
Subject: * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Avoid non-portable "`\" nesting
X-Git-Tag: emacs-24.3.91~78
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ac903abc8cebd281b2ab263770e293c096bbfca;p=emacs.git

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Avoid non-portable "`\" nesting

Fixes: debbugs:17339
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5a783d32660..22722046436 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-29  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in ($(DESTDIR)${archlibdir}):
+	Avoid non-portable "`\" nesting.  (Bug#17339)
+
 2014-04-16  Eli Zaretskii  <eliz@gnu.org>
 
 	* update-game-score.c (write_scores): Condition fchmod call on
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 56cdc09e0fe..4d9fdba7726 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -247,8 +247,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 \
+	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 ; \