[ft-devel] broken includes and ftversion from freetype-config in 2.5.2

[Hin-Tak Leung]

Hi Werner,

Looks like a few "freetype2" should be removed from freetype-config:

$ pkg-config --variable includedir freetype2
/usr/include/freetype2

$ freetype-config --cflags
-I/usr/include/freetype2/freetype2

since "pkg-config --variable includedir freetype2" already put $includedir
right, some of the hard-coded "/freetype2/" in freetype-config
shouldn't be there? :

------------
if test "$echo_ft_version" = "yes" ; then
  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
         | grep FREETYPE_MAJOR \
         | sed 's/.*[   ]\([0-9][0-9]*\).*/\1/'`
  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
         | grep FREETYPE_MINOR \
         | sed 's/.*[   ]\([0-9][0-9]*\).*/\1/'`
  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
         | grep FREETYPE_PATCH \
         | sed 's/.*[   ]\([0-9][0-9]*\).*/\1/'`
  echo $major.$minor.$patch
fi

if test "$echo_cflags" = "yes" ; then
  cflags="-I${SYSROOT}$includedir/freetype2"
  echo $cflags
fi
------------

That affects ftversion and cflags.

Hin-Tak