From ccf4f1d80e82b2fa5156f1a351a5e1cd8dde3be0 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 24 Oct 2013 17:23:29 +0200
Subject: hyphen: stop building hyph_en_US.dic too

Change-Id: I05929be5dbc41ba6889bd593ad0ce0061367ea37
---
 external/hyphen/ExternalProject_hyphen.mk |  1 -
 external/hyphen/Module_hyphen.mk          | 13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'external/hyphen')

diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk
index e7d36730fd70..573fbae00de0 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
 			$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
 		&& $(MAKE) \
-			$(if $(filter YESYES,$(SYSTEM_HYPH)$(WITH_MYSPELL_DICTS)),hyph_en_US.dic) \
 	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk
index 1dde6dd2126e..80dae1f219ed 100644
--- a/external/hyphen/Module_hyphen.mk
+++ b/external/hyphen/Module_hyphen.mk
@@ -9,23 +9,26 @@
 
 $(eval $(call gb_Module_Module,hyphen))
 
-ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),)
+ifeq ($(SYSTEM_HYPH),NO)
+
 $(eval $(call gb_Module_add_targets,hyphen,\
 	UnpackedTarball_hyphen \
 ))
+
 ifeq ($(COM),MSC)
 
-ifeq ($(SYSTEM_HYPH),NO)
 $(eval $(call gb_Module_add_targets,hyphen,\
 	StaticLibrary_hyphen \
 ))
-endif
 
 else
+
 $(eval $(call gb_Module_add_targets,hyphen,\
 	ExternalProject_hyphen \
 ))
-endif
-endif
+
+endif # $(COM)
+
+endif # $(SYSTEM_HYPH)
 
 # vim: set noet sw=4 ts=4:
-- 
cgit