2 files changed, 7 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 31247765a26..9d5eda1cadf 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el):
+        Quote entities that might contain whitespace.
+
 2013-10-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Improve support for popcount and counting trailing zeros (Bug#15550).
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index df225cc8cbf..91fb5a07305 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -30,7 +30,7 @@ abs_top_builddir = @abs_top_builddir@
 
 EMACS = ${abs_top_builddir}/src/emacs
 DSTDIR = ${top_srcdir}/lisp/international
-emacs = ${EMACS} -batch --no-site-file --no-site-lisp
+emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 
 all: ${DSTDIR}/charprop.el
 
@@ -42,7 +42,7 @@ unidata.txt: ${srcdir}/UnicodeData.txt
 
 ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
         cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
-          -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt
+          -f unidata-gen-files ${srcdir} "${abs_builddir}/unidata.txt"
 
 ## Like the above, but generate in PWD rather than lisp/international.
 charprop.el: ${srcdir}/unidata-gen.elc unidata.txt