Merge from trunk and resolve conflicts.

[gnu-emacs] / admin / unidata / Makefile.in

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 4649b3b339d2735529756798e47855e2498a0cb1..05d3f929f1801ee9db0203d8a90aede005966a4a 100644 (file)
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -54,7 +54,9 @@ FORCE =
 FORCE:
 .PHONY: FORCE
 
-${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \
+${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el \
+  ${srcdir}/UnicodeData.txt ${srcdir}/BidiMirroring.txt \
+  ${srcdir}/BidiBrackets.txt | \
   ${srcdir}/unidata-gen.elc unidata.txt
        -if [ -f "$@" ]; then \
          cd ${unidir} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \