fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-04-24 19:40:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix relocatable test in wine

Browse source 
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
This commit is contained in:
Dan Nicholson 2015-02-21 11:37:49 -08:00
parent 818aeace3b
commit cdaa522911
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
check/check-relocatable
View file

@ -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