* Makefile.in (install-arch-indep): Allow ' ' in destdir.

This fixes a bug in the previous change.  Also, use $(SHELL)
rather than sh, as that's more likely to be portable.

Fixes: debbugs:16717

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a470cb0dcc..6ba50b37ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (install-arch-indep): Allow ' ' in destdir (Bug#16717).
+        This fixes a bug in the previous change.  Also, use $(SHELL)
+        rather than sh, as that's more likely to be portable.
+
 2014-02-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (install-arch-indep): Simplify (Bug#16717).
diff --git a/Makefile.in b/Makefile.in
index 44ba084bee4..76a030407b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -614,8 +614,9 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
           ${write_subdir} || true
         [ -z "${GZIP_PROG}" ] || { \
           echo "Compressing *.el ..." && \
-          find "$(DESTDIR)${lispdir}" -name '*.elc' -exec sh -c \
-            '${GZIP_PROG} -9n `expr "$$@" : "\\(.*\\)c"`' dummy '{}' ';'; \
+          cd "$(DESTDIR)${lispdir}" && \
+          find . -name '*.elc' -exec $(SHELL) -c \
+            '${GZIP_PROG} -9n `expr "$$1" : "\\(.*\\)c"`' dummy '{}' ';'; \
         }
         -chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS}