cpp/openttd-patchpack/source Changeset - r12008:976162879be1

Changeset - r12008:976162879be1

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-05-24 17:34:39
rubidium@openttd.org

(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.

2 files changed with 9 insertions and 4 deletions:

Makefile.src.in

configure

0 comments (0 inline, 0 general)

Makefile.src.in

➞

Show inline comments

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

configure

➞

Show inline comments

@@ @@ -22,11 +22,16 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; @@
 fi
 # Find out where configure is (in what dir)
 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
 PWD="`pwd`"
 # Same here as for the ROOT_DIR above
 PWD="`pwd -W 2>/dev/null || pwd 2>/dev/null`"
 PREFIX="$PWD/bin"
 . $ROOT_DIR/config.lib

0 comments (0 inline, 0 general)