diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2015-02-21 11:37:49 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2015-02-21 11:37:49 -0800 |
| commit | cdaa522911a7cd113a33353d9148b5c6c6ff7e0c (patch) | |
| tree | f2efd95835cca5245866537cd733936b2f9a2aac | |
| parent | 818aeace3b08d731d104d5ef9b1d5e3c34dd4192 (diff) | |
Fix relocatable test in wine
Wine outputs the paths with carriage returns, which later breaks
commands they're used in. Hopefully this doesn't break the msys case,
but I think it should be safe enough. Really this needs general handling
of Windows paths instead of ad hoc fixes, but that's for another day.
https://bugs.freedesktop.org/show_bug.cgi?id=66939
| -rwxr-xr-x | check/check-relocatable | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/check/check-relocatable b/check/check-relocatable index b7ab93a..589eddf 100755 --- a/check/check-relocatable +++ b/check/check-relocatable @@ -8,8 +8,8 @@ if [ "$native_win32" = yes ]; then # Assume we have cmd to do the conversion, except we have to escape # the command switch on MSYS. [ "$OSTYPE" = msys ] && opt="\\/C" || opt="/C" - abs_top_srcdir=$($WINE cmd $opt echo "$abs_top_srcdir") - abs_srcdir=$($WINE cmd $opt echo "$abs_srcdir") + abs_top_srcdir=$($WINE cmd $opt echo "$abs_top_srcdir" | tr -d '\r') + abs_srcdir=$($WINE cmd $opt echo "$abs_srcdir" | tr -d '\r') fi # See if the pcfiledir variable is defined. First, with the path |