[Guile-commits] 29/47: Fix the rule to check for new signals and errors

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 99555262a90eef0ee73a57e7004d47bc7ad0eec6
Author: David Michael <address@hidden>
Date:   Wed Jul 22 12:48:24 2015 -0400

    Fix the rule to check for new signals and errors
    
    Fixes <http://bugs.gnu.org/21114>.
    
    * libguile/Makefile.am (chknew-E chknew-SIG): Remove the line
      continuation after the targets, and include numbers in the
      recipe's signal/error regexp to catch names like E2BIG.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 libguile/.gitignore  |    1 +
 libguile/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libguile/.gitignore b/libguile/.gitignore
index 16c60ec..41a8f7a 100644
--- a/libguile/.gitignore
+++ b/libguile/.gitignore
@@ -13,3 +13,4 @@ libpath.h
 scmconfig.h
 version.h
 vm-i-*.i
+*.NEW
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 3bc9952..ae546dd 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -815,13 +815,13 @@ MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(CFLAGS)
 
 # Write $(srcdir)/cpp-{E,SIG}.syms.NEW if there are any not-yet-seen
 # ("new" to us) E* or SIG* symbols in <errno.h> or <signal.h>, respectively.
-chknew-E chknew-SIG:                                           \
+chknew-E chknew-SIG:
        @bit=`echo $@ | sed s/^chknew-//` ;                     \
        old="$(srcdir)/cpp-$$bit.syms" ;                        \
        echo "#include <$${bit}.h>"                             \
         | sed 's/E/errno/;s/SIG/signal/'                       \
         | gcc -dM -E -                                         \
-        | sed 's/^#define //;/^'$$bit'[A-Z][A-Z]*/!d;s/ .*//'  \
+        | sed 's/^#define //;/^'$$bit'[0-9A-Z][0-9A-Z]*/!d;s/ .*//'    \
         | sort | diff -u $$old - | sed '1,2d;/^+/!d;s/^.//'    \
         > TMP ;                                                \
        if [ -s TMP ] ; then new="$$old.NEW" ;                  \