summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2016-05-11 18:39:18 +0000
committerrubidium <rubidium@openttd.org>2016-05-11 18:39:18 +0000
commit9a05a688a7ec77113b89c222162cff4b5a68719b (patch)
tree9cba8938a66f09b62f4403373fdf1a55fa036799
parent9ea3e427689134de3c5ea186a50fccf7f4cb2e8e (diff)
downloadopenttd-9a05a688a7ec77113b89c222162cff4b5a68719b.tar.xz
(svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able
-rw-r--r--Makefile.bundle.in2
-rw-r--r--Makefile.src.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 969b2ebcf..4366cf10a 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -84,7 +84,7 @@ endif
$(Q)cp "$(BIN_DIR)/scripts/"* "$(BUNDLE_DIR)/scripts/"
ifdef MENU_DIR
$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
- $(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) | $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
+ $(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | LC_ALL=C $(SORT) | $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
endif
ifeq ($(TTD), openttd.exe)
diff --git a/Makefile.src.in b/Makefile.src.in
index 1d654d283..0e190a4e6 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -210,7 +210,7 @@ endif
{ \
print $$0 \
} \
- ' < Makefile.dep.tmp | sed 's@ *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
+ ' < Makefile.dep.tmp | sed 's@ *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak