Skip to content

Commit 6e5092f

Browse files
author
rubidium
committed
-Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able
git-svn-id: http://svn.openttd.org/trunk@27558 6aa0318a-3be1-0310-93fa-89fd2396df07
1 parent 5743e16 commit 6e5092f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile.bundle.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ endif
8484
$(Q)cp "$(BIN_DIR)/scripts/"* "$(BUNDLE_DIR)/scripts/"
8585
ifdef MENU_DIR
8686
$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
87-
$(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"
87+
$(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"
8888
$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
8989
endif
9090
ifeq ($(TTD), openttd.exe)

Makefile.src.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ endif
210210
{ \
211211
print $$0 \
212212
} \
213-
' < Makefile.dep.tmp | sed 's@ *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
213+
' < Makefile.dep.tmp | sed 's@ *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
214214

215215
$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
216216

0 commit comments

Comments
 (0)