X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libiberty%2Fgather-docs;h=94a1212fe73a088b0f2ad2ab4a70ea58c3addc22;hb=28ce7b07473c33f2e4e380a861973d68ffe8017f;hp=be4dbbfc1e2a3aab7f37a53742c06fc3bcec003c;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/gather-docs b/libiberty/gather-docs
index be4dbbfc1e..94a1212fe7 100644
--- a/libiberty/gather-docs
+++ b/libiberty/gather-docs
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # -*- perl -*-
 
-#   Copyright (C) 2001
-#   Free Software Foundation
+#   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of the libiberty library.
 # Libiberty is free software; you can redistribute it and/or
@@ -73,8 +72,8 @@ for $in (@ARGV) {
 
 	    if (/^\@def[a-z]*[a-wyz] /) {
 		
-		($name) = m/[^\(]* ([^\( \t\r\n]+) *\(/;
-		$name =~ s/[ 	]*$//;
+		($name) = m/[^\(]* ([^\( \t\r\n\@]+) *(\(|\@?$)/;
+		$name =~ s/[	 ]*\@?$//;
 		$key = $name;
 		$key =~ tr/A-Z/a-z/;
 		$key =~ s/[^a-z0-9]+/ /g;
@@ -110,7 +109,7 @@ print "Writing $outfile\n" if $verbose;
 print OUT "\@c Automatically generated from *.c and others (the comments before\n";
 print OUT "\@c each entry tell you which file and where in that file).  DO NOT EDIT!\n";
 print OUT "\@c Edit the *.c files, configure with --enable-maintainer-mode,\n";
-print OUT "\@c and let gather-docs build you a new copy.\n\n";
+print OUT "\@c run 'make stamp-functions' and gather-docs will build a new copy.\n\n";
 
 for $key (sort keys %name) {
     print OUT "\@c $src_file{$key}:$src_line{$key}\n";