[tracker] build: Fixed the way locales are included for FireFox and Thunderbird

[Martyn James Russell <mr src gnome org>]

commit cae756248c3cd64da59fe9d05f85829634a8b588
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Feb 14 12:49:49 2014 +0000

    build: Fixed the way locales are included for FireFox and Thunderbird
    
    Fixes distcheck

 configure.ac                                       |    5 ---
 src/plugins/firefox/chrome/locale/Makefile.am      |   32 ++++++++++++++++-
 .../firefox/chrome/locale/en-US/Makefile.am        |    9 -----
 .../firefox/chrome/locale/es-ES/Makefile.am        |    9 -----
 .../firefox/chrome/locale/fr-FR/Makefile.am        |    9 -----
 .../firefox/chrome/locale/pl-PL/Makefile.am        |    9 -----
 src/plugins/thunderbird/chrome/locale/Makefile.am  |   38 +++++++++++++++++++-
 .../thunderbird/chrome/locale/en-US/Makefile.am    |   10 -----
 .../thunderbird/chrome/locale/pl-PL/Makefile.am    |   10 -----
 9 files changed, 68 insertions(+), 63 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7d0a1f1..1d70322 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2560,7 +2560,6 @@ AC_CONFIG_FILES([
         src/plugins/thunderbird/chrome/Makefile
         src/plugins/thunderbird/chrome/content/Makefile
         src/plugins/thunderbird/chrome/locale/Makefile
-        src/plugins/thunderbird/chrome/locale/en-US/Makefile
         src/plugins/thunderbird/chrome/skin/Makefile
         src/plugins/thunderbird/defaults/Makefile
         src/plugins/thunderbird/defaults/preferences/Makefile
@@ -2569,10 +2568,6 @@ AC_CONFIG_FILES([
         src/plugins/firefox/chrome/Makefile
         src/plugins/firefox/chrome/content/Makefile
         src/plugins/firefox/chrome/locale/Makefile
-        src/plugins/firefox/chrome/locale/en-US/Makefile
-        src/plugins/firefox/chrome/locale/es-ES/Makefile
-        src/plugins/firefox/chrome/locale/fr-FR/Makefile
-        src/plugins/firefox/chrome/locale/pl-PL/Makefile
         src/plugins/firefox/chrome/skin/Makefile
         src/plugins/firefox/defaults/Makefile
         src/plugins/firefox/defaults/preferences/Makefile
diff --git a/src/plugins/firefox/chrome/locale/Makefile.am b/src/plugins/firefox/chrome/locale/Makefile.am
index ad86229..26bd7f2 100644
--- a/src/plugins/firefox/chrome/locale/Makefile.am
+++ b/src/plugins/firefox/chrome/locale/Makefile.am
@@ -1,3 +1,33 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = en-US es-ES fr-FR pl-PL
+# General
+localesdir = $(datadir)/xul-ext/trackerfox/chrome/locale/
+
+localesdata = \
+       about.dtd \
+       overlay.dtd \
+       overlay.properties
+
+# locales = en-US es-ES fr-FR pl-PL
+
+# en-US
+locale_en_USdir = $(localesdir)/en-US/
+locale_en_US_DATA = $(patsubst %,en-US/%,$(localesdata))
+
+# es-ES
+locale_es_ESdir = $(localesdir)/es-ES/
+locale_es_ES_DATA = $(patsubst %,es-ES/%,$(localesdata))
+
+# fr-FR
+locale_fr_FRdir = $(localesdir)/fr-FR/
+locale_fr_FR_DATA = $(patsubst %,fr-FR/%,$(localesdata))
+
+# pl-PL
+locale_pl_PLdir = $(localesdir)/pl-PL/
+locale_pl_PL_DATA = $(patsubst %,pl-PL/%,$(localesdata))
+
+EXTRA_DIST = \
+       $(locale_en_US_DATA) \
+       $(locale_es_ES_DATA) \
+       $(locale_fr_FR_DATA) \
+       $(locale_pl_PL_DATA)
diff --git a/src/plugins/thunderbird/chrome/locale/Makefile.am 
b/src/plugins/thunderbird/chrome/locale/Makefile.am
index 04fb23c..41f2632 100644
--- a/src/plugins/thunderbird/chrome/locale/Makefile.am
+++ b/src/plugins/thunderbird/chrome/locale/Makefile.am
@@ -1,3 +1,39 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = en-US de-DE es-ES fr-FR pl-PL
+# General
+localesdir = $(datadir)/xul-ext/trackerbird/chrome/locale/
+
+localesdata = \
+       options.dtd \
+       about.dtd \
+       overlay.dtd \
+       overlay.properties
+
+# locales = de-DE en-US es-ES fr-FR pl-PL
+
+# de-DE
+locale_de_DEdir = $(localesdir)/de-DE/
+locale_de_DE_DATA = $(patsubst %,de-DE/%,$(localesdata))
+
+# en-US
+locale_en_USdir = $(localesdir)/en-US/
+locale_en_US_DATA = $(patsubst %,en-US/%,$(localesdata))
+
+# es-ES
+locale_es_ESdir = $(localesdir)/es-ES/
+locale_es_ES_DATA = $(patsubst %,es-ES/%,$(localesdata))
+
+# fr-FR
+locale_fr_FRdir = $(localesdir)/fr-FR/
+locale_fr_FR_DATA = $(patsubst %,fr-FR/%,$(localesdata))
+
+# pl-PL
+locale_pl_PLdir = $(localesdir)/pl-PL/
+locale_pl_PL_DATA = $(patsubst %,pl-PL/%,$(localesdata))
+
+EXTRA_DIST = \
+       $(locale_de_DE_DATA) \
+       $(locale_en_US_DATA) \
+       $(locale_es_ES_DATA) \
+       $(locale_fr_FR_DATA) \
+       $(locale_pl_PL_DATA)