* admin/unidata/Makefile.in: Check for deleted uni- files.

(all): Use unifiles rather than charprop.el.
(FORCE): New variable and phony rule.
(${unidir}/charprop.el): Respect FORCE.
(unifiles): New rule.

* src/Makefile.in ($(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el): Add explicit FORCE.

Fixes: debbugs:18489

2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7a6b38f3b90..1b77d1c9aa1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(srcdir)/macuvs.h)
+        ($(lispsource)/international/charprop.el): Add explicit FORCE.
+
 2014-10-07  Eli Zaretskii  <eliz@gnu.org>
 
         * decompress.c (init_zlib_functions): Move the message about zlib
diff --git a/src/Makefile.in b/src/Makefile.in
index dfa5854489b..dffb77e7338 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -437,8 +437,12 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
 $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
         $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)"
 
+## FORCE it so that admin/unidata can decide whether these files
+## are up-to-date.  Although since charprop depends on bootstrap-emacs,
+## and emacs (which recreates bootstrap-emacs) depends on charprop,
+## in practice this rule was always run anyway.
 $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
-  bootstrap-emacs$(EXEEXT)
+  bootstrap-emacs$(EXEEXT) FORCE
         $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)"
 
 ## The dumped Emacs is as functional and more efficient than