2 files changed, 8 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0b91cc4887f..46faf95c0c0 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}):
+        Quote entities that might contain whitespace.
+
 2013-10-10  Glenn Morris  <rgm@gnu.org>
 
         * make-docfile.c (search_lisp_doc_at_eol):
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 994eb2bb266..01c03e162cc 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -232,7 +232,7 @@ $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
         umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
-        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
+        if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" != "`/bin/pwd`" ]; then \
           for file in ${UTILITIES}; do \
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
           done ; \
@@ -244,8 +244,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 \
+        if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" \
+             != "`cd ${srcdir} && /bin/pwd`" ]; then \
           for file in ${SCRIPTS}; do \
             $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
           done ; \