Fix distcheck error

This commit is contained in:
Akira TAGOH 2017-12-05 21:57:19 +09:00
parent 1b2279d6b5
commit a6797cd5c2
2 changed files with 3 additions and 3 deletions

View File

@ -17,10 +17,10 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
if FREETYPE_PCF_LONG_FAMILY_NAMES if FREETYPE_PCF_LONG_FAMILY_NAMES
out.expected: $(srcdir)/out.expected-long-family-names out.expected: $(srcdir)/out.expected-long-family-names
cp $(srcdir)/out.expected-long-family-names out.expected cp $(srcdir)/out.expected-long-family-names $(builddir)/out.expected
else else
out.expected: $(srcdir)/out.expected-no-long-family-names out.expected: $(srcdir)/out.expected-no-long-family-names
cp $(srcdir)/out.expected-no-long-family-names out.expected cp $(srcdir)/out.expected-no-long-family-names $(builddir)/out.expected
endif endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)

View File

@ -51,7 +51,7 @@ check () {
echo "=" >> out echo "=" >> out
$FCLIST - family pixelsize | sort >> out $FCLIST - family pixelsize | sort >> out
tr -d '\015' <out >out.tmp; mv out.tmp out tr -d '\015' <out >out.tmp; mv out.tmp out
if cmp out $EXPECTED > /dev/null ; then : ; else if cmp out $TESTDIR/$EXPECTED > /dev/null ; then : ; else
echo "*** Test failed: $TEST" echo "*** Test failed: $TEST"
echo "*** output is in 'out', expected output in '$EXPECTED'" echo "*** output is in 'out', expected output in '$EXPECTED'"
exit 1 exit 1