From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 8 Oct 2002 21:40:29 +0000 (+0000)
Subject: For Debian Bug#162583:
X-Git-Tag: Release-1-7b~410
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fb82dc12dbd2929a7616a0cbee8940dd99268eaf;p=automake.git

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 f0a02a73..09dd26c4 100644
--- 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 8f26ad65..9272a40c 100644
--- 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 f1538398..be97793c 100755
--- 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.