diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-04-30 21:54:52 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-04-30 21:54:52 +0200 |
| commit | 09b911adf4e22bbcac8c588bc14ade801276732e (patch) | |
| tree | 0d9eb9708479bb491d7e1e2bb030aa3e90299526 /lib-src | |
| parent | b0e36b7048c88aa24f6955c53fbe790bb9ebc54f (diff) | |
| parent | 426b5dafdd837328d624a8ec5bfd567f2865c9f5 (diff) | |
| download | emacs-09b911adf4e22bbcac8c588bc14ade801276732e.tar.gz | |
Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0acdeecff8f..94ba8f4a9c2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2014-04-30 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 91d13231f39..6f25d75db76 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 ; \ |