* automake.in (&variable_conditions_permutations): Separate the

conditions.
* tests/cond3.test: Improve the sed expression.

diff --git a/ChangeLog b/ChangeLog
index 5578e7fa1a745e762334f3d99d891e44cbba7989..e5a17ff9cc2210c849f9b0430f544a989cc09f56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-12  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&variable_conditions_permutations): Separate the
+       conditions.
+       * tests/cond3.test: Improve the sed expression.
+
 2001-03-09  Pavel Roskin  <proski@gnu.org>
 
        * Makefile.am (maintainer-check): Scan all *.am files and tests

diff --git a/automake.in b/automake.in
index b7704bb206d891b5e460e39d81f0bae788c63759..5c80bc918e1781af70623df667561c0bba377c74 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5487,7 +5487,8 @@ sub make_condition
       unless $res;
 
     $res = '@' . $res . '@';
-    $res =~ s/ /@@/;
+    $res =~ s/ /@@/g;
+
     return $res;
 }
 
@@ -5869,8 +5870,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)
     {

diff --git a/tests/cond3.test b/tests/cond3.test
index e00beb539d98e09a2c7888d7e66d8960e3426775..8f53e0d11e6c9c6acdc02689beb3a0773311b456 100755 (executable)
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -40,14 +40,17 @@ END
 
 $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'