From 0545d5108e11ae27d0ba2fe6ee77a1ed5386a746 Mon Sep 17 00:00:00 2001
From: Kimmo Suominen <kimmo@suominen.com>
Date: Mon, 11 Mar 2024 08:45:30 +0200
Subject: [PATCH] Use LC_ALL instead of LC_COLLATE

Closes issue #96.
---
 Makefile.in  | 3 ++-
 Makefile.std | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0b86c2cd..4b71e49e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -598,7 +598,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	${CPP} $(CPPFLAGS) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\
 	    $(srcdir)/tc.const.c | \
 	    sed -n -e 's/^\(Char STR[a-zA-Z0-9_]*\) *\[ *\].*/extern \1[];/p' | \
-	    LC_COLLATE=C sort >> $@.tmp
+	    LC_ALL=C sort >> $@.tmp
 	@echo '#endif /* _h_tc_const */' >> $@.tmp
 	@if [ -f $@ ] && cmp -s $@.tmp $@; then echo $@ unchanged.; rm -f $@.tmp; else mv -f $@.tmp $@; echo $@ recreated.; fi
 
@@ -725,6 +725,7 @@ check test: atconfig atlocal $(srcdir)/tests/testsuite $(BUILD)
 	$(ENVCMD) - \
 		TESTSUITEREGEN="$(TESTSUITEREGEN)" \
 		USER="$(USER)" \
+		LC_ALL=C \
 		$(SHELL) $(srcdir)/tests/testsuite $(TESTSUITEFLAGS)
 
 #
diff --git a/Makefile.std b/Makefile.std
index 1da5f777..0d2f1ac7 100644
--- a/Makefile.std
+++ b/Makefile.std
@@ -390,7 +390,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	${CPP} $(INCLUDES) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\
 	    $(srcdir)/tc.const.c | grep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\) *\[ *\].*/extern Char \1[];/' | \
-	    LC_COLLATE=C sort >> $@
+	    LC_ALL=C sort >> $@
 	@echo '#endif /* _h_tc_const */' >> $@
 
 csh.prof: ${OBJS} sh.prof.${SUF} mcrt0.${SUF}