bug 672320 pt 1 - include all available hyphenation patterns in the build. r=smontagu
authorJonathan Kew <jfkthame@gmail.com>
Wed, 20 Jul 2011 11:15:13 +0100
changeset 73069 59533328a665804be473c13eafc76581604e8cc4
parent 73068 faa1737443dd084c2595fc7fd583ae1e602c365b
child 73070 b88768594e630076cdc7c48edaa3eb45cb74e5a4
push idunknown
push userunknown
push dateunknown
reviewerssmontagu
bugs672320
milestone8.0a1
bug 672320 pt 1 - include all available hyphenation patterns in the build. r=smontagu
intl/hyphenation/src/nsHyphenationManager.cpp
intl/locales/Makefile.in
--- a/intl/hyphenation/src/nsHyphenationManager.cpp
+++ b/intl/hyphenation/src/nsHyphenationManager.cpp
@@ -209,17 +209,17 @@ nsHyphenationManager::LoadPatternListFro
       locale.Cut(0, 5);
     }
     locale.SetLength(locale.Length() - 4); // strip ".dic"
     for (PRUint32 i = 0; i < locale.Length(); ++i) {
       if (locale[i] == '_') {
         locale.Replace(i, 1, '-');
       }
     }
-#ifdef DEBUG
+#ifdef DEBUG_hyph
     printf("adding hyphenation patterns for %s: %s\n", locale.get(),
            NS_ConvertUTF16toUTF8(dictName).get());
 #endif
     nsCOMPtr<nsIAtom> localeAtom = do_GetAtom(locale);
     mPatternFiles.Put(localeAtom, file);
   }
 }
 
--- a/intl/locales/Makefile.in
+++ b/intl/locales/Makefile.in
@@ -42,20 +42,17 @@ VPATH          = @srcdir@
 relativesrcdir = intl/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
 
-PATTERN_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hyphenation/*.dic))
-ifneq ($(AB_CD),en-US)
-PATTERN_FILES += $(strip $(wildcard $(srcdir)/en-US/hyphenation/*.dic))
-endif
+PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic))
 
 ifneq (,$(PATTERN_FILES))
 libs::
 	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(PATTERN_FILES) $(DESTDIR)$(mozappdir)/hyphenation
 endif