[Libreoffice-commits] .: mythes/ExternalProject_mythes.mk

[Libreoffice Gerrit user]

 mythes/ExternalProject_mythes.mk |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0cc05a8f1db4c289dff0e95de6161cf3f3af58e6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Oct 28 23:10:55 2012 +0100

    fix mythes build
    
    Change-Id: I505a4a780e8fedbb41cd031d71d6a5e53c36624e

diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 87c5439..1d2ab7b 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,mythes))
 
 $(eval $(call gb_ExternalProject_use_unpacked,mythes,mythes))
 
+$(eval $(call gb_ExternalProject_use_package,mythes,hunspell))
+
 $(eval $(call gb_ExternalProject_register_targets,mythes,\
 	build \
 ))
@@ -19,7 +21,10 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
 	cd $(EXTERNAL_WORKDIR) \
 	&& ./configure --disable-shared --with-pic \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
-	$(if $(filter NO,$(SYSTEM_HUNSPELL)),HUNSPELL_CFLAGS="-I$(OUTDIR)/inc/hunspell" HUNSPELL_LIBS="-L$(OUTDIR)/lib -lhunspell-1.3") \
+	$(if $(filter NO,$(SYSTEM_HUNSPELL)), \
+		HUNSPELL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)" \
+		HUNSPELL_LIBS="-L$(OUTDIR)/lib -lhunspell" \
+	) \
 	$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
 	&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
 	&& touch $@