Changeset - r22367:cf8b605e1164
[Not reviewed]
master
0 1 0
rubidium - 9 years ago 2016-05-12 17:24:06
rubidium@openttd.org
(svn r27562) -Fix: forgot one (hidden) case to force sorting to be locale independent
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
configure
Show inline comments
 
@@ -140,25 +140,25 @@ AWKCOMMAND='
 
	/\.h$/ { next }
 
	/\.hpp$/ { next }
 
	{
 
		if (deep == skip) {
 
			gsub("	", "", $0);
 
			print $0;
 
		}
 
	}
 
'
 

	
 
# Read the source.list and process it
 
# Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
 
SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
 
SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | LC_ALL=C $PIPE_SORT`"
 

	
 
OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
 
OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
 
OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.mm$/  { gsub(\".mm$\",  \".o\", $0); print $0; }'`"
 
OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.rc$/  { gsub(\".rc$\",  \".o\", $0); print $0; }'`"
 
SRCS="`    echo \"$SRCS\" | $awk ' { ORS = \" \" } { print $0; }'`"
 

	
 
# In makefiles, we always use -u for sort
 
if [ -z "$sort" ]; then
 
	sort="sed s@a@a@"
 
else
 
	sort="$sort -u"
0 comments (0 inline, 0 general)