Work around Gnulib/gettext mismatch

The versions of gettext infrastructure files installed by gnulib-tool
don't necessarily match our configured AM_GNU_GETTEXT_VERSION, so we
need to fix things up in bootstrap.

* bootstrap.conf (gnulib_tool_option_extras): Set --po-base to gl/ref-po
rather than gnulib/po.
(bootstrap_post_import_hook): Merge temporary gl/ref-po directory into
gl/po.

1 files changed, 13 insertions, 1 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
index 896b087b..810cd154 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -71,7 +71,7 @@ gnulib_modules="
 "
 
 gnulib_tool_option_extras="\
- --po-base=gnulib/po \
+ --po-base=gl/ref-po \
  --no-conditional-dependencies \
  --libtool \
  --macro-prefix=gl \
@@ -116,6 +116,18 @@ tar        -
 bootstrap_post_import_hook () {
   patch -s -p1 <patches/argp-domain.patch
   patch -s -p1 <patches/fdutimens-hurd.patch
+
+  # gnulib-tool installs its own versions of gettext infrastructure files
+  # such as po/Makefile.in.in, which don't necessarily match our configured
+  # AM_GNU_GETTEXT_VERSION.  To cope with this, we tell gnulib-tool to
+  # install into a temporary directory (using --po-base above) and fix
+  # things up here.
+  cp -a gl/ref-po/LINGUAS gl/ref-po/POTFILES.in gl/po/
+  sed 's,^subdir *=.*,subdir = gl/po,' gl/ref-po/Makevars >gl/po/Makevars
+  if ls gl/ref-po/*.po >/dev/null 2>&1; then
+    cp -a gl/ref-po/*.po gl/po/
+  fi
+  rm -rf gl/ref-po
 }
 
 bootstrap_epilogue () {