* automake.in (define_objects_from_sources,

handle_lib_objects_cond, value_to_list): Use quotemeta instead of
the equivalant substitution.

diff --git a/ChangeLog b/ChangeLog
index e7b1783a006141f0490553fd91718f3e4dc784ee..39a6bb04b7a3281da04207562bd3826dee1b69a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (define_objects_from_sources,
+       handle_lib_objects_cond, value_to_list): Use quotemeta instead of
+       the equivalant substitution.
+
 2001-11-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (SUFFIX_RULE_PATTERN): Add '_(){}$@' to the

diff --git a/automake.in b/automake.in
index d9726782917089889e543de21a38b1728b4b2005..6e3249d5c3a638306fbca859c27de2505f41de39 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2065,7 +2065,7 @@ sub define_objects_from_sources ($$$$$$$)
                {
                    $subvar = $1;
                    $to = $3;
-                   ($from = $2) =~ s/(\W)/\\$1/g;
+                   $from = quotemeta $2;
                }
                push @substfroms, $from;
                push @substtos, $to;
@@ -2342,8 +2342,7 @@ sub handle_lib_objects_cond
                    my $rewrite = $iter;
                    $rewrite =~ s/\.c$/.P$myobjext/;
                    $dep_files{'$(DEPDIR)/' . $rewrite} = 1;
-                   ($rewrite = $iter) =~ s/(\W)/\\$1/g;
-                   $rewrite = "^" . $rewrite . "\$";
+                   $rewrite = "^" . quotemeta ($iter) . "\$";
                    # Only require the file if it is not a built source.
                    if (! variable_defined ('BUILT_SOURCES')
                        || ! grep (/$rewrite/,
@@ -6275,7 +6274,7 @@ sub value_to_list ($$$)
            {
                $varname = $1;
                $to = $3;
-               ($from = $2) =~ s/(\W)/\\$1/g;
+               $from = quotemeta $2;
            }
 
            # Find the value.