* Makefile.maint: Sync with Bison, i.e.:

(po-check): Scan .l and .y files instead of the
.c and the .h files that they generate.  This fixes the bug
reported by Tim Van Holder in:
<http://mail.gnu.org/pipermail/bison-patches/2002-November/001352.html>
Look for N_ as well as for _.  Try to avoid matching #define for
N_ and _.
From Paul Eggert.

diff --git a/ChangeLog b/ChangeLog
index b7b01c801e224686d11fb026189a3454161dd501..569f2f43a59297f8cc5fb40f3f50d4318dd974a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-14  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint: Sync with Bison, i.e.:
+       (po-check): Scan .l and .y files instead of the
+       .c and the .h files that they generate.  This fixes the bug
+       reported by Tim Van Holder in:
+       <http://mail.gnu.org/pipermail/bison-patches/2002-November/001352.html>
+       Look for N_ as well as for _.  Try to avoid matching #define for
+       N_ and _.
+       From Paul Eggert.
+
 2002-11-14  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (C Compiler): Compiling several files at once.

diff --git a/Makefile.maint b/Makefile.maint
index e2e90f742f70553269fa9ba80f54265c64b90271..83efdf30e9cb6121f3715d15c25f96059821f24a 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -97,7 +97,16 @@ m4-check:
 po-check:
        if test -f po/POTFILES.in; then \
          grep -E -v '^(#|$$)' po/POTFILES.in | sort > $@-1; \
-         grep -E -l '\b_\(' lib/*.[ch] src/*.[ch] | sort > $@-2; \
+         files=; \
+         for file in lib/*.[chly] src/*.[chly]; do \
+           case $$file in \
+           *.[ch]) \
+             base=`expr " $$file" : ' \(.*\)\..'`; \
+             { test -f $$base.l || test -f $$base.y; } && continue;; \
+           esac; \
+           files="$$files $$file"; \
+         done; \
+         grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort > $@-2; \
          diff -u $@-1 $@-2 || exit 1; \
          rm -f $@-1 $@-2; \
        fi