submitted-intl-tstgettext

2017-08-26  Aurelien Jarno  <aurelien@aurel32.net>

	[BZ #21508]
	* catgets/Makefile ($(objpfx)de.msg): Depend on
	$(common-objpfx)intl/tst-gettext-de.po instead of $(..)po/de.po.
	* intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
	intl/tst-gettext-de.po from po/de.po by removing the
	POT-Creation-Date line.
	($(objpfx)msgs.h): Depend on $(objpfx)tst-gettext-de.po instead of
	../po/de.po.
	* intl/tst-gettext.sh: Use ${objpfx}tst-gettext-de.po instead of
	../po/de.po.

Gbp-Pq: Topic any
Gbp-Pq: Name submitted-intl-tstgettext.diff

diff --git a/catgets/Makefile b/catgets/Makefile
index e5f49491fb3f34ba2abd17e7edb074962775658c..ace23e58e10202e1ca2ff37001f7a6ac076f131d 100644 (file)
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -77,7 +77,7 @@ $(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat
 $(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
 
 # Generate a non-simple input file.
-$(objpfx)de.msg: xopen-msg.awk $(..)po/de.po
+$(objpfx)de.msg: xopen-msg.awk $(common-objpfx)intl/tst-gettext-de.po
        LC_ALL=C $(AWK) -f $^ $< > $@
 
 $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \

diff --git a/intl/Makefile b/intl/Makefile
index 60d5d24fa1d67fad5e5169b25f5c0553c320926c..d911d1c0d3ae44c4219df947f8a0e7c4fe69b1bf 100644 (file)
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -120,7 +120,11 @@ $(objpfx)tst-gettext6.out: $(gen-locales)
 $(objpfx)tst-translit.out: $(gen-locales)
 endif
 
-$(objpfx)msgs.h: po2test.awk ../po/de.po
+$(objpfx)tst-gettext-de.po: ../po/de.po
+       $(make-target-directory)
+       LC_ALL=C $(AWK) '!/^"POT-Creation-Date: [0-9-]+ [0-9:+-]+\\n"$$/' $^ > $@
+
+$(objpfx)msgs.h: po2test.awk $(objpfx)tst-gettext-de.po
        $(make-target-directory)
        LC_ALL=C $(AWK) -f $^ > $@
 

diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index 5c4775b81739fcb16cb5cf1fc915de7e3add3583..be7ea3a3998578225095a6b5fc08ee55e1b57d21 100755 (executable)
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -42,9 +42,9 @@ mkdir -p ${objpfx}domaindir/existing-locale/LC_MESSAGES
 mkdir -p ${objpfx}domaindir/existing-locale/LC_TIME
 # Populate them.
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
-       -f ../po/de.po
+       -f ${objpfx}tst-gettext-de.po
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_TIME/existing-time-domain.mo \
-       -f ../po/de.po
+       -f ${objpfx}tst-gettext-de.po
 
 # Now run the test.
 ${test_program_prefix_before_env} \