1 diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk
2 index 347ddcd64..4eea8b738 100755
3 --- a/build-aux/prefix-gnulib-mk
4 +++ b/build-aux/prefix-gnulib-mk
5 @@ -40,6 +40,7 @@ use File::Basename; # for dirname
6 (my $ME = $0) =~ s|.*/||;
13 @@ -162,7 +163,7 @@ sub prefix_assignment ($$)
15 # Variables whose name depend on the location: libbison_a_SOURCES =>
16 # lib_libbison_a_SOURCES.
17 - $lhs_and_assign_op =~ s/($lib_name)/lib_$1/g;
18 + $lhs_and_assign_op =~ s/($lib_name)/${varprefix}$1/g;
20 $lhs_and_assign_op . $rhs;
22 @@ -243,6 +244,8 @@ sub process ($)
25 $prefix = (dirname $file) . '/';
26 + $varprefix = $prefix;
27 + $varprefix =~ s{/}{_}g;
28 warn "prefix=$prefix\n";