From 45fb479c48453d8b4caaf3196298fde71b039b63 Mon Sep 17 00:00:00 2001 From: Jim Meyering 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 | 6 ++++++ build-aux/bootstrap | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 143254368..ebc9b45b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-04-16 Jim Meyering + + 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 Fix recursion of install-* into po directories. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 31eb651f6..d749fe27d 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 -- 2.11.0