cpp/openttd-patchpack/source Changeset - r22363:fb80f5d6c1ba

Changeset - r22363:fb80f5d6c1ba

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 9 years ago 2016-05-11 18:39:18
rubidium@openttd.org

(svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able

2 files changed with 2 insertions and 2 deletions:

Makefile.bundle.in

Makefile.src.in

0 comments (0 inline, 0 general)

Makefile.bundle.in

➞

Show inline comments

@@ @@ -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)

Makefile.src.in

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)