For Debian Bug#162583:

* automake.in (file_contents_internal): Simplify regex to
separate relationship from actions in rules.
Reported by Sam Hocevar.

diff --git a/ChangeLog b/ChangeLog
index f0a02a7..09dd26c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-10-08  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       For Debian Bug#162583:
+       * automake.in (file_contents_internal): Simplify regex to
+       separate relationship from actions in rules.
+       Reported by Sam Hocevar.
+
        * lib/Automake/Conditional.pm (has): Simplify.
 
 2002-10-07  Alexandre Duret-Lutz  <adl@gnu.org>

diff --git a/THANKS b/THANKS
index 8f26ad6..9272a40 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -174,6 +174,7 @@ Robert Boehne               rboehne@ricardo-us.com
 Robert Collins         robert.collins@itdomain.com.au
 Rusty Ballinger                rusty@rlyeh.engr.sgi.com
 Ryan T. Sammartino     ryants@shaw.ca
+Sam Hocevar            sam@zoy.org
 Sergey Vlasov          vsu@mivlgu.murom.ru
 Seth Alves             alves@hungry.com
 Shuhei Amakawa         <sa264@cam.ac.uk>

diff --git a/automake.in b/automake.in
index f153839..be97793 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -8163,10 +8163,8 @@ sub file_contents_internal ($$$%)
          # Separate relationship from optional actions: the first
          # `new-line tab" not preceded by backslash (continuation
          # line).
-         # I'm quite shoked!  It seems that (\\\n|[^\n]) is not the
-         # same as `([^\n]|\\\n)!!!  Don't swap it, it breaks.
          my $paragraph = $_;
-         /^((?:\\\n|[^\n])*)(?:\n(\t.*))?$/som;
+         /^(.*?)(?:(?<!\\)\n(\t.*))?$/som;
          my ($relationship, $actions) = ($1, $2 || '');
 
          # Separate targets from dependencies: the first colon.