aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-04-29 07:54:58 -0700
committerGlenn Morris2014-04-29 07:54:58 -0700
commit7ac903abc8cebd281b2ab263770e293c096bbfca (patch)
tree6d63beeffae4b4f0f0f47799c83b9cbbb4e0d80d
parentca489750c2c47e641fd78f2e3ea6276e3b54f5d4 (diff)
downloademacs-7ac903abc8cebd281b2ab263770e293c096bbfca.tar.gz
emacs-7ac903abc8cebd281b2ab263770e293c096bbfca.zip
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Avoid non-portable "`\" nesting
Fixes: debbugs:17339
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/Makefile.in4
2 files changed, 7 insertions, 2 deletions
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 @@
12014-04-29 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(DESTDIR)${archlibdir}):
4 Avoid non-portable "`\" nesting. (Bug#17339)
5
12014-04-16 Eli Zaretskii <eliz@gnu.org> 62014-04-16 Eli Zaretskii <eliz@gnu.org>
2 7
3 * update-game-score.c (write_scores): Condition fchmod call on 8 * 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
247 chown ${gameuser} "$(DESTDIR)${gamedir}"; \ 247 chown ${gameuser} "$(DESTDIR)${gamedir}"; \
248 chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \ 248 chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
249 fi 249 fi
250 if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" \ 250 exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
251 != "`cd ${srcdir} && /bin/pwd`" ]; then \ 251 if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
252 for file in ${SCRIPTS}; do \ 252 for file in ${SCRIPTS}; do \
253 $(INSTALL_SCRIPT) ${srcdir}/$$file "$(DESTDIR)${archlibdir}/$$file"; \ 253 $(INSTALL_SCRIPT) ${srcdir}/$$file "$(DESTDIR)${archlibdir}/$$file"; \
254 done ; \ 254 done ; \