From 9bfa2644feac79b87cc0d78b11ec9c210b78bba5 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 25 May 2019 19:40:10 +0200 Subject: [PATCH] prefix-gnulib-mk: Fix CPPFLAGS migration * build-aux/prefix-gnulib-mk (prefix_assignment): Don't forget the _a part of the library name. --- ChangeLog | 6 ++++++ build-aux/prefix-gnulib-mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cd6145c75..3887af14a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-05-26 Akim Demaille + + prefix-gnulib-mk: Fix CPPFLAGS migration. + * build-aux/prefix-gnulib-mk (prefix_assignment): Don't forget the + _a part of the library name. + 2019-05-24 Paul Eggert flexmember: update comments again diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk index 706b077b87..bef726f6bb 100755 --- a/build-aux/prefix-gnulib-mk +++ b/build-aux/prefix-gnulib-mk @@ -112,7 +112,7 @@ sub prefix_assignment ($$) elsif ($lhs_and_assign_op =~ /^(AM_CFLAGS|AM_CPPFLAGS)\ \+?=/x) { - $lhs_and_assign_op =~ s/^AM_(\w+)\ \+?=/${lib_name}_$1 =/; + $lhs_and_assign_op =~ s/^AM_(\w+)\ \+?=/${lib_name}_a_$1 =/; $rhs = " \$(AM_$1)$rhs"; } # We don't want to inherit gnulib's AUTOMAKE_OPTIONS, comment them. -- 2.39.5