From 7b49149ab4178ed30943cb4b413633ee00c9b784 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 16 Nov 2001 10:33:15 +0000 Subject: [PATCH] * automake.in (define_objects_from_sources, handle_lib_objects_cond, value_to_list): Use quotemeta instead of the equivalant substitution. --- ChangeLog | 6 ++++++ automake.in | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7b1783a0..39a6bb04b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-16 Alexandre Duret-Lutz + + * 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 * automake.in (SUFFIX_RULE_PATTERN): Add '_(){}$@' to the diff --git a/automake.in b/automake.in index d97267829..6e3249d5c 100755 --- 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. -- 2.47.2