build: manually update bootstrap from gnulib, and adapt

[bison.git] / etc / prefix-gnulib-mk

diff --git a/etc/prefix-gnulib-mk b/etc/prefix-gnulib-mk
index 1bff69bc70238c4be96ca02d0686647e2c507c58..4debcb931833e361b00b7df36bc350145b1b85ba 100755 (executable)
--- a/etc/prefix-gnulib-mk
+++ b/etc/prefix-gnulib-mk
@@ -10,7 +10,7 @@ my $prefix = "lib/";
 sub contents ($)
 {
   my ($file) = @_;
-  local $/;                    # Turn on slurp-mode.
+  local $/;                     # Turn on slurp-mode.
   my $f = new IO::File "< $file" or die "$file";
   my $contents = $f->getline or die "$file";
   $f->close;
@@ -26,7 +26,7 @@ sub prefix_word ($)
 {
   local ($_) = @_;
   $_ = $prefix . $_
-    unless m{^\$\(\w+\)} || $_ eq "Makefile";
+    unless /^-/ || m{^\$\(\w+\)} || $_ eq "Makefile" || $_ eq '\\';
   return $_;
 }
 
@@ -90,7 +90,7 @@ sub prefix ($)
   # Prefix all the occurrence of files in rules.  If there is nothing
   # after in the :, it's probably a phony target, or a suffix rule.
   # Don't touch it.
-  s{^([-\w/]+\.[-\w.]+ *: *\S.*)$}
+  s{^([-\w+/]+\.[-\w.]+ *: *\S.*)$}
    {prefix_words($1)}gem;
 
   # Prefix files in variables.