Port en@quot changes to gettext-tools.

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index c5405e4a30d3849d94c6d67bc2bc6b89302673df..2868c1953fb5a1150260ad91e484fcf0aca903f7 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -15,6 +15,17 @@
        * vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
        * zh_CN.po: Update from Ji ZhengYu <zhengyuji@gmail.com>.
 
+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-06-04  Daiki Ueno  <ueno@gnu.org>
 
        Support for Vala.

diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index fce63a6e95e32260270df498b020b5ddf317d32f..0545d2a7646fd3e31129d965492e1e4c0e0a31c2 100644 (file)
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/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-tools/po/Rules-quot b/gettext-tools/po/Rules-quot
index d2ac20dce7e868c986bb0c213731179311b73e9c..5931e539232121cc8a1ee61cf101399e33d51edf 100644 (file)
--- a/gettext-tools/po/Rules-quot
+++ b/gettext-tools/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 \