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).
Hah. I realized why that change worked for me.
Remember how I said I'd first tried using $gnulib_extra_files?
Well, that had added a symlink in my coreutils dir from
build-aux/po/Makefile.in.in to the file in gnulib/...
With that, my patch worked.
> Actually, while at it, why not a symlink, as for the other
> components of gnulib?
>From 1a0e0aefd4b1fbef0c6e5d990bc01499fd153a0d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Mon, 16 Apr 2012 18:50:42 +0200
Subject: [PATCH] bootstrap: really use gnulib's po/Makefile.in.in
* build-aux/bootstrap: Correct the source file name in previous change.
Reported by Akim Demaille.
---
ChangeLog | 4 ++++
build-aux/bootstrap | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8817dab..c08ba76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-04-16 Jim Meyering <meyer...@redhat.com>
+ bootstrap: really use gnulib's po/Makefile.in.in
+ * build-aux/bootstrap: Correct the source file name in previous change.
+ Reported by Akim Demaille.
+
configmake: correct minor inconsistency in Makefile rule
* modules/configmake (Makefile.am): All other rules like this one
run the final "mv -f ..." in the same backslash-continued command
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.
--
1.7.10.169.g146fe
