Akim Demaille wrote:
> Hi Paul, hi all!
>
> I would really like some help here. I am probably missing
> something, but I am under the impression that the coreutils
> are using gettext's po/Makefile.in.in instead of gnulib's,
> so your fixes, Paul, would not be installed–as my first
> diff below attempts to show.
>
> Since I would like Bison to use the same approach as the
> Coreutils, I would be very to understand my misunderstanding.
Hi Akim,
You're right that coreutils does not use gnulib's po/Makefile.in.in.
At first, I though I could fix that by adding $build_aux/po/Makefile.in.in
to $gnulib_extra_files, but that would not copy it to po/.
Instead, this is the patch I suspect we will use:
[below the patch, I've included the induced differences for coreutils]
>From 0a5677642b8d9df02c05d569875bdca235084f43 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Mon, 16 Apr 2012 12:13:14 +0200
Subject: [PATCH] bootstrap: use gnulib's po/Makefile.in.in, not the one from
gettext
* build-aux/bootstrap: Use gnulib's po/Makefile.in.in, not
the one from gettext. Reported by Akim Demaille.
---
ChangeLog | 4 ++++
build-aux/bootstrap | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 54f33e9..33f553d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-04-16 Jim Meyering <meyer...@redhat.com>
+ bootstrap: use gnulib's po/Makefile.in.in, not the one from gettext
+ * build-aux/bootstrap: Use gnulib's po/Makefile.in.in, not
+ the one from gettext. Reported by Akim Demaille.
+
maint: avoid spurious "make sc_maint" failure
* cfg.mk (exclude_file_name_regexp--sc_trailing_blank): Also
exempt all *.class file names, for lib/javaversion.class.
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
+
if test -d runtime-po; then
# Similarly for runtime-po/Makevars, but not quite the same.
rm -f runtime-po/Makevars
--
1.7.10.169.g146fe
=====================================================
Here are the differences induced by the patch above, i.e., by using
the po/Makefile.in.in from gnulib rather than the one from gettext:
--- po/Makefile.in.in.~1~ 2012-04-16 11:35:37.400568590 +0200
+++ po/Makefile.in.in 2012-04-16 12:01:07.293038452 +0200
@@ -96,14 +96,14 @@ CATALOGS = @CATALOGS@
mv t-$@ $@
-all: check-macro-version all-@USE_NLS@
+all: all-@USE_NLS@
all-yes: stamp-po
all-no:
# Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
- @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+ test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
|| { echo "*** error: gettext infrastructure mismatch: using a
Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf
macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
exit 1; \
}
@@ -123,6 +123,7 @@ check-macro-version:
# $(POFILES) has been designed to not touch files that don't need to be
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
+ @$(CHECK_MACRO_VERSION)
test ! -f $(srcdir)/$(DOMAIN).pot || \
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
