From b5d555b86743e83cd8cc5d959c4564ddc698953c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 7 Jul 2013 09:31:38 +0900 Subject: [PATCH] Port en@quot changes to gettext-tools. --- gettext-tools/po/ChangeLog | 11 +++++++++++ gettext-tools/po/Makefile.in.in | 1 + gettext-tools/po/Rules-quot | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index c5405e4a3..2868c1953 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -15,6 +15,17 @@ * vi.po: Update from Trần Ngọc Quân . * zh_CN.po: Update from Ji ZhengYu . +2013-06-25 Daiki Ueno + + 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 + . + 2013-06-04 Daiki Ueno Support for Vala. diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index fce63a6e9..0545d2a76 100644 --- 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 d2ac20dce..5931e5392 100644 --- 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 \ -- 2.47.2