[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnulib-bug
Subject:    Re: [bug-gettext] the manual is incomplete about using a compendium PO file
From:       Akim Demaille <akim () lrde ! epita ! fr>
Date:       2019-05-26 7:27:07
Message-ID: 80617FD2-4B7A-4D02-BF2C-9613D133CD45 () lrde ! epita ! fr
[Download RAW message or body]

Hi,

> Le 23 avr. 2019 à 18:19, Akim Demaille <akim@lrde.epita.fr> a écrit :
> 
> 
>> Le 21 avr. 2019 à 19:40, Akim Demaille <akim@lrde.epita.fr> a écrit :
>> 
>> commit 03dad082c4de5a7551374eeb8b58a69ab95f78a9
>> Author: Akim Demaille <akim.demaille@gmail.com>
>> Date:   Sun Apr 21 18:17:14 2019 +0200
>> 
>>   prefix-gnulib-mk: fix the support for gnulib-po
>> 
>>   * build-aux/prefix-gnulib-mk (prefix_assignment): Remove useless $res.
>>   Don't touch HAVE_* variables.
>>   Map AM_CPPFLAGS and AM_CPPFLAGS to the library's corresponding variables.
> 
> Installed in gnulib.

I'm installing this on top of it.  It generated

lib_libbison_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"

instead of

lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"


commit 9bfa2644feac79b87cc0d78b11ec9c210b78bba5
Author: Akim Demaille <akim.demaille@gmail.com>
Date:   Sat May 25 19:40:10 2019 +0200

    prefix-gnulib-mk: Fix CPPFLAGS migration
    
    * build-aux/prefix-gnulib-mk (prefix_assignment): Don't forget the
    _a part of the library name.

diff --git a/ChangeLog b/ChangeLog
index 2cd6145c7..3887af14a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-26  Akim Demaille  <akim@lrde.epita.fr>
+
+	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  <eggert@cs.ucla.edu>
 
 	flexmember: update comments again
diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk
index 706b077b8..bef726f6b 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.


[prev in list] [next in list] [prev in thread] [next in thread]