summaryrefslogtreecommitdiff
path: root/external/fontconfig
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-10-24 23:12:32 +0300
committerTor Lillqvist <tml@collabora.com>2013-10-24 23:14:24 +0300
commit49f6c5907a2ec8c1886e3157de2c843d332aabcf (patch)
treeb14b13a52a6e176ce6e8d9e4e8b8a092f60f4366 /external/fontconfig
parent01a51764c5eff1c883d3a19381ab4d8971471492 (diff)
Fix freetype and fontconfig problems
We need to do a "make install" in freetype so that what freetype-config --libs outputs is correct. We don't use freetype-config ourselves but fontconfig does, and it builds some test programs. The bundled freetype and fontconfig are built only for Android. Change-Id: Ib622cc48a0c4eb6a72188bc83c8d36b39f97fdca
Diffstat (limited to 'external/fontconfig')
-rw-r--r--external/fontconfig/ExternalProject_fontconfig.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index 74438d09d54b..e4de004bdc34 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--with-arch=arm \
--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
- --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \
+ --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
&& $(MAKE) \
)