mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16419) -Fix [FS#2916]: MSYS has two distinct ways to write paths. When calling external binaries it resolves paths which causes comparisons between a resolved and unresolved path. So always use the resolved path instead of the unresolved one.

release/1.0
rubidium 2009-05-24 17:34:39 +00:00
parent ad64d5eedb
commit 4033f786bd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.src.in
View File

@ -190,7 +190,7 @@ endif
# Convert x:/... paths to /x/... for mingw # Convert x:/... paths to /x/... for mingw
ifeq ($(OS), MINGW) ifeq ($(OS), MINGW)
@cat Makefile.dep.tmp | sed 's@\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw @cat Makefile.dep.tmp | sed 's@/\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
@cp Makefile.dep.tmp.mingw Makefile.dep.tmp @cp Makefile.dep.tmp.mingw Makefile.dep.tmp
@rm -f Makefile.dep.tmp.mingw @rm -f Makefile.dep.tmp.mingw
endif endif
@ -200,7 +200,7 @@ endif
@$(AWK) ' \ @$(AWK) ' \
/^# DO NOT/ { print $$0 ; next} \ /^# DO NOT/ { print $$0 ; next} \
/^#/ {next} \ /^#/ {next} \
/:/ { \ /: / { \
left = NF - 1; \ left = NF - 1; \
for (n = 2; n <= NF; n++) { \ for (n = 2; n <= NF; n++) { \
if (match($$n, "^$(ROOT_DIR)") == 0) { \ if (match($$n, "^$(ROOT_DIR)") == 0) { \

9
configure vendored
View File

@ -22,11 +22,16 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
fi fi
# Find out where configure is (in what dir) # Find out where configure is (in what dir)
ROOT_DIR="`dirname $0`" ROOT_DIR="`dirname $0`"
ROOT_DIR="`cd $ROOT_DIR && pwd`" # For MSYS/MinGW we want to know the FULL path. This as that path is generated
# once you call an outside binary. Having the same path for the rest is needed
# for dependency checking.
# pwd -W returns said FULL path, but doesn't exist on others so fall back.
ROOT_DIR="`cd $ROOT_DIR && (pwd -W 2>/dev/null || pwd 2>/dev/null)`"
check_path_characters check_path_characters
PWD="`pwd`" # Same here as for the ROOT_DIR above
PWD="`pwd -W 2>/dev/null || pwd 2>/dev/null`"
PREFIX="$PWD/bin" PREFIX="$PWD/bin"
. $ROOT_DIR/config.lib . $ROOT_DIR/config.lib