Bug 93075 - Possible fix for make check failure on msys/MinGW...

Patch from Christian Fafard
This commit is contained in:
Akira TAGOH 2015-11-24 10:46:34 +09:00
parent 1d87fab8b1
commit 5886d98c36
1 changed files with 9 additions and 4 deletions

View File

@ -20,10 +20,15 @@
# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
TESTDIR=${srcdir-`pwd`} case "$OSTYPE" in
msys ) MyPWD=`pwd -W` ;; # On Msys/MinGW, returns a MS Windows style path.
* ) MyPWD=`pwd` ;; # On any other platforms, returns a Unix style path.
esac
FONTDIR=`pwd`/fonts TESTDIR=${srcdir-"$MyPWD"}
CACHEDIR=`pwd`/cache.dir
FONTDIR="$MyPWD"/fonts
CACHEDIR="$MyPWD"/cache.dir
ECHO=true ECHO=true
@ -62,7 +67,7 @@ dotest () {
sed "s!@FONTDIR@!$FONTDIR! sed "s!@FONTDIR@!$FONTDIR!
s!@CACHEDIR@!$CACHEDIR!" < $TESTDIR/fonts.conf.in > fonts.conf s!@CACHEDIR@!$CACHEDIR!" < $TESTDIR/fonts.conf.in > fonts.conf
FONTCONFIG_FILE=`pwd`/fonts.conf FONTCONFIG_FILE="$MyPWD"/fonts.conf
export FONTCONFIG_FILE export FONTCONFIG_FILE
dotest "Basic check" dotest "Basic check"