aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2013-12-30 22:03:52 +0200
committerArnold D. Robbins <arnold@skeeve.com>2013-12-30 22:03:52 +0200
commitb66997935edae4d5881b11422c6f284d0627cebe (patch)
treef69c7ab0ea7cf2352204b755cd1b8022457d416c
parentdad5f25058c4ecf69ebe4543a13281d3f28c69bc (diff)
parent6b76f3d292993fe2a15a515d078726cd68fd78d8 (diff)
downloadegawk-b66997935edae4d5881b11422c6f284d0627cebe.tar.gz
egawk-b66997935edae4d5881b11422c6f284d0627cebe.tar.bz2
egawk-b66997935edae4d5881b11422c6f284d0627cebe.zip
Merge branch 'gawk-4.1-stable' into new-vms
-rw-r--r--test/ChangeLog6
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index cc81d9a4..81fed7c8 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-30 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (ignrcas2): Change to use en_US.UTF-8; it
+ seems that plain en_US doesn't exist anymore. Thanks to
+ Richard Palo.
+
2013-12-29 John E. Malmberg <wb8tyw@qsl.net>
* fts.awk: Adjust for VMS.
diff --git a/test/Makefile.am b/test/Makefile.am
index fb265747..371a13ea 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1452,7 +1452,7 @@ widesub4::
ignrcas2::
@echo $@
- @GAWKLOCALE=en_US ; export GAWKLOCALE ; \
+ @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
$(AWK) -f "$(srcdir)"/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/Makefile.in b/test/Makefile.in
index 421767b4..c2efe1ed 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1876,7 +1876,7 @@ widesub4::
ignrcas2::
@echo $@
- @GAWKLOCALE=en_US ; export GAWKLOCALE ; \
+ @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
$(AWK) -f "$(srcdir)"/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@