[Libreoffice-commits] core.git: fontconfig/ExternalProject_fontconfig.mk

[Tor Lillqvist]

 fontconfig/ExternalProject_fontconfig.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 514414ca2845d62056730c72fd2c14cbb5ba19c0
Author: Tor Lillqvist <t...@collabora.com>
Date:   Mon Sep 30 10:51:27 2013 +0300

    Fix up the expat dependency
    
    Change-Id: I426779bbe0308a4e1c3bc567fe2ca67805d95e55

diff --git a/fontconfig/ExternalProject_fontconfig.mk 
b/fontconfig/ExternalProject_fontconfig.mk
index b520a11..64ccbe6 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
 
 $(eval $(call gb_ExternalProject_use_packages,fontconfig,\
+       expat \
        freetype \
 ))
 
@@ -24,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
                        --disable-shared \
                        --with-arch=arm \
                        --with-expat-includes=$(call 
gb_UnpackedTarball_get_dir,expat)/lib \
-                       --with-expat-lib=$(OUTDIR)/lib \
+                       --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
                        --with-freetype-config=$(OUTDIR)/bin/freetype-config \
                        --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
                && $(MAKE) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits