Re: How can I import build-aux/po/Makefile.in.in

[Jim Meyering]

Akim Demaille wrote:

> Le 16 avr. 2012 à 12:16, Jim Meyering a écrit :
>
>> diff --git a/build-aux/bootstrap b/build-aux/bootstrap
>> index 31eb651..d749fe2 100755
>> --- a/build-aux/bootstrap
>> +++ b/build-aux/bootstrap
>> @@ -1,6 +1,6 @@
>> #! /bin/sh
>> # Print a version string.
>> -scriptversion=2012-02-11.09; # UTC
>> +scriptversion=2012-04-16.10; # UTC
>>
>> # Bootstrap this package from checked-out sources.
>>
>> @@ -863,6 +863,8 @@ if test $with_gettext = yes; then
>>     }
>>   ' po/Makevars.template >po/Makevars || exit 1
>>
>> +  cat $build_aux/po/Makefile.in.in > po/Makefile.in.in || exit 1
>
> Actually this does not work for me (= bison).  $build_aux is
> build-aux, not gnulib/build-aux, so it does not find Makefile.in.in.
> It fails the same way on my checkout of coreutils (when I update its
> gnulib and force the use of gnulib's bootstrap).

Oops.  This should work better:

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d749fe2..16dc15c 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-04-16.10; # UTC
+scriptversion=2012-04-16.16; # UTC

 # Bootstrap this package from checked-out sources.

@@ -863,7 +863,7 @@ if test $with_gettext = yes; then
     }
   ' po/Makevars.template >po/Makevars || exit 1

-  cat $build_aux/po/Makefile.in.in > po/Makefile.in.in || exit 1
+  cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in || exit 1

   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.

> Actually, while at it, why not a symlink, as for the other
> components of gnulib?

Well, at least coreutils ends up modifying po/Makefile.in.in further,
via this from bootstrap.conf, which made me prefer to copy rather
than to link:

bootstrap_epilogue()
{
  # Since this is a "GNU" package, replace this line
  #   if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null \
  #      | grep -v 'libtool:' >/dev/null; then
  # with this:
  #   if true; then
  # Why?  That pipeline searches all files in $(top_srcdir), and if you
  # happen to have large files (or apparently large sparse files), the
  # first grep may well run out of memory.
  perl -pi -e 's/if LC_ALL=C grep .GNU .PACKAGE.*; then/if true; then/' \
    po/Makefile.in.in