21-fix-cond3.patch

[Akim Demaille]

This is the bug reported by Lars.


Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&variable_conditions_permutations): Separate the
        conditions.
        * tests/cond3.test: Improve the sed expression.

Index: automake.in
--- automake.in Fri, 09 Mar 2001 00:28:22 +0100 akim (am/f/39_automake.i 1.135 
755)
+++ automake.in Sat, 10 Mar 2001 11:43:14 +0100 akim (am/f/39_automake.i 1.135 
755)
@@ -5488,7 +5488,7 @@ sub make_condition
       if $res eq '' or $res eq '#' ;

     $res = '@' . $res . '@';
-    $res =~ s/ /@@/;
+    $res =~ s/ /@@/g;

     return $res;
 }
@@ -5963,8 +5963,8 @@ sub variable_conditions_permutations
     my @ret;
     foreach my $sub (&variable_conditions_permutations (@comps))
     {
-       push (@ret, $comp . $sub);
-       push (@ret, $neg . $sub);
+       push (@ret, "$comp $sub");
+       push (@ret, "$neg $sub");
     }
     if (! @ret)
     {
Index: tests/cond3.test
--- tests/cond3.test Sat, 10 Mar 2001 11:41:12 +0100 akim (am/e/8_cond3.test 
1.2 775)
+++ tests/cond3.test Sat, 10 Mar 2001 11:42:33 +0100 akim (am/e/8_cond3.test 
1.2 775)
@@ -40,14 +40,17 @@

 $AUTOMAKE || exit 1

-sed -n -e '/am_targ_OBJECTS =.*\\$/ {
-   :loop
-   p
-   n
-   /\\$/ b loop
-   p
-   n
-   }' -e '/am_targ_OBJECTS =/ p' Makefile.in >produced
+# `b top' so that
+sed -n '
+/am_targ_OBJECTS =/ {
+  : loop
+  /\\$/ {
+    p
+    n
+    b loop
+  }
+  p
+}' Makefile.in >produced


 cat >expected << 'EOF'