Allow user to supply custom sed command when generating en@quot.po.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 065912cc4a8c0ca4cc2f754c0828a70a602578e5..8191a6f2c8ee5c921fb98944f87c948e2a655688 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25  Daiki Ueno  <ueno@gnu.org>
+
+       Allow user to supply custom sed command when generating en@quot.po.
+       * po.m4 (AM_PO_SUBDIRS): Require AC_PROG_SED.
+
 2013-04-23  Daiki Ueno  <ueno@gnu.org>
 
        Obsolete gt_CHECK_DECL in favor of AC_CHECK_DECLS.

diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index f39572343522bc23770642fbe30f740bc75ad616..b98bfeaa5e6e63c68c6e1c65873c073fa31cc3b9 100644 (file)
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 20 (gettext-0.18.2)
+# po.m4 serial 21 (gettext-0.18.2)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,6 +25,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
   AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index f9fc0efb9bdbb1ae17f952563a5c3496d44385a9..dedd03e35b12a54fff59c195e581a0d98340cdc0 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,14 @@
+2013-06-25  Daiki Ueno  <ueno@gnu.org>
+
+       Allow user to supply custom sed command when generating en@quot.po.
+       This is necessary because BSD Sed is known not to work well with
+       an input not ending with a newline.
+       * Makefile.in.in (SED): Define using @SED@.
+       * Rules-quot: Use '$(SED)' instead of 'sed' as the FILTER argument
+       of msgfilter.
+       Reported by Mats Erik Andersson in
+       <https://lists.gnu.org/archive/html/bug-gettext/2013-04/msg00028.html>.
+
 2013-03-02  Bruno Haible  <bruno@clisp.org>
 
        * bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index fce63a6e95e32260270df498b020b5ddf317d32f..0545d2a7646fd3e31129d965492e1e4c0e0a31c2 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -15,6 +15,7 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 

diff --git a/gettext-runtime/po/Rules-quot b/gettext-runtime/po/Rules-quot
index d2ac20dce7e868c986bb0c213731179311b73e9c..5931e539232121cc8a1ee61cf101399e33d51edf 100644 (file)
--- a/gettext-runtime/po/Rules-quot
+++ b/gettext-runtime/po/Rules-quot
@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-update-en
        ll=`echo $$lang | sed -e 's/@.*//'`; \
        LC_ALL=C; export LC_ALL; \
        cd $(srcdir); \
-       if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+       if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
            rm -f $$tmpdir/$$lang.new.po; \
          else \