(compile-last): Ensure GREP_OPTIONS is null before calling

grep, so that binary files (eg international/uni-bidi.el) can match.
Remove test for "UnicodeData" files, since it is hopefully unnecesary
now, and in any case the file header format has changed.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bb1fd985b4..959b20b9273 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-18  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (compile-last): Ensure GREP_OPTIONS is null before calling
+        grep, so that binary files (eg international/uni-bidi.el) can match.
+        Remove test for "UnicodeData" files, since it is hopefully unnecesary
+        now, and in any case the file header format has changed.
+
 2009-10-17  Glenn Morris  <rgm@gnu.org>
 
         * textmodes/flyspell.el (flyspell-large-region, flyspell-word)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 1d3f680b857..ebe02e21fbe 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1505,15 +1505,13 @@ compile-always: doit
         $(MAKE) $(MFLAGS) compile EMACS=$(EMACS)
 
 ## In case any files are missing from ELCFILES.
-## Why is the UnicodeData check needed, when these files are no-byte-compile?
 compile-last:
         @wd=$(lisp); $(setwins); \
         els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
         for el in $$els; do \
           test -f $$el || continue; \
           test -f $${el}c && continue; \
-          grep 'no-byte-compile: t' $$el > /dev/null && continue; \
-          head -n 1 $$el | grep '^;; Automatically generated from UnicodeData.txt.' > /dev/null && continue; \
+          GREP_OPTIONS= grep 'no-byte-compile: t' $$el > /dev/null && continue; \
           sel=`echo $$el | sed "s|^$(lisp)|\\$$(lisp)|"`; \
           echo "Maintainer warning: $$sel missing from \$$ELCFILES?"; \
           echo "Compiling $$el"; \