diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-24 17:34:39 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-24 17:34:39 +0000 |
| commit | 4033f786bdea696ae04811cfbe930eca4f9bcf40 (patch) | |
| tree | d1b63b70f8dad6297a1814b21a4673bbb380bfba /Makefile.src.in | |
| parent | ad64d5eedb2f7282b72d06a9bb14e40c88914f0f (diff) | |
| download | openttd-4033f786bdea696ae04811cfbe930eca4f9bcf40.tar.xz | |
(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.
Diffstat (limited to 'Makefile.src.in')
| -rw-r--r-- | Makefile.src.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index f20d14c82..715a62fb2 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -190,7 +190,7 @@ endif # Convert x:/... paths to /x/... for 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 @rm -f Makefile.dep.tmp.mingw endif @@ -200,7 +200,7 @@ endif @$(AWK) ' \ /^# DO NOT/ { print $$0 ; next} \ /^#/ {next} \ - /:/ { \ + /: / { \ left = NF - 1; \ for (n = 2; n <= NF; n++) { \ if (match($$n, "^$(ROOT_DIR)") == 0) { \ |