aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2013-12-30 22:03:01 +0200
committerArnold D. Robbins <arnold@skeeve.com>2013-12-30 22:03:01 +0200
commitc34e30427363c70688233a4ce0be44dfc92c6226 (patch)
treea1fc9543d65274862c233c45563ac64bebb1ecdc
parent103a8db5ae7d7faa60d71b3ef1255869022dbb8d (diff)
parent6b76f3d292993fe2a15a515d078726cd68fd78d8 (diff)
downloadegawk-c34e30427363c70688233a4ce0be44dfc92c6226.tar.gz
egawk-c34e30427363c70688233a4ce0be44dfc92c6226.tar.bz2
egawk-c34e30427363c70688233a4ce0be44dfc92c6226.zip
Merge branch 'gawk-4.1-stable'
-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 33c5ca05..5b911fa0 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-10 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am: Remove instances of "" that were incorrect.
diff --git a/test/Makefile.am b/test/Makefile.am
index 13c9b977..9c00062d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1454,7 +1454,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 17249a14..d1cdb26a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1878,7 +1878,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 _$@