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.

diff --git a/ChangeLog b/ChangeLog
index 1432543..ebc9b45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-16  Jim Meyering  <meyering@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.
+
 2012-04-16  Joel E. Denny  <joeldenny@joeldenny.org>
 
        Fix recursion of install-* into po directories.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 31eb651..d749fe2 100755 (executable)
--- 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