Merge from emacs-24; up to 117698

2 files changed, 6 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 17de5a49902..1c439504892 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
+        unmsys--file-name.  (Bug#18955)
+
 2014-11-10  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (set-version): No need to update doc/man/emacs.1.
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 05d3f929f18..94504818d12 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -41,7 +41,7 @@ all: ${top_srcdir}/src/macuvs.h unifiles
 ${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
   ${srcdir}/uvs.elc
         ${emacs} -L ${srcdir} -l uvs \
-          --eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \
+          --eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \
           > $@
 
 %.elc: %.el