[tracker/thunderbird] thunderbird: Build system and plugin now work properly with TB >= 5.0

[Martyn James Russell <mr src gnome org>]

commit 38996458289da7cb0c9b3b80264b9cb1fa27728d
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jul 28 10:42:20 2011 +0100

    thunderbird: Build system and plugin now work properly with TB >= 5.0

 configure.ac                                       |    9 ++++-
 src/plugins/thunderbird/Makefile.am                |   36 ++++---------------
 src/plugins/thunderbird/chrome/Makefile.am         |    3 ++
 src/plugins/thunderbird/chrome/content/Makefile.am |   16 +++++++++
 src/plugins/thunderbird/chrome/locale/Makefile.am  |    3 ++
 .../thunderbird/chrome/locale/en-US/Makefile.am    |    8 ++++
 src/plugins/thunderbird/chrome/skin/Makefile.am    |    5 +++
 src/plugins/thunderbird/defaults/Makefile.am       |    3 ++
 .../thunderbird/defaults/preferences/Makefile.am   |    5 +++
 9 files changed, 59 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a0c5b04..d04dcb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1223,7 +1223,7 @@ if test "x$have_tracker_miner_thunderbird" = "xyes"; then
                               [path to Thunderbird plugin directory]))
    if test "x$with_thunderbird_plugin_dir" = "x" ; then
       # This is a symlinked to $prefix/share/xul-ext
-      tracker_miner_thunderbird_install_dir="${prefix}/lib/thunderbird/extensions"
+      tracker_miner_thunderbird_install_dir="${prefix}/lib/thunderbird-5.0/extensions"
    else
       tracker_miner_thunderbird_install_dir="$with_tracker_miner_thunderbird_install_dir"
    fi
@@ -2134,6 +2134,13 @@ AC_CONFIG_FILES([
 	src/plugins/evolution/Makefile
 	src/plugins/thunderbird/Makefile
 	src/plugins/thunderbird/install.rdf
+        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
 	src/plugins/nautilus/Makefile
 	src/vapi/Makefile
 	tests/common/Makefile
diff --git a/src/plugins/thunderbird/Makefile.am b/src/plugins/thunderbird/Makefile.am
index e2d78a0..982c672 100644
--- a/src/plugins/thunderbird/Makefile.am
+++ b/src/plugins/thunderbird/Makefile.am
@@ -1,35 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 
-# $(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)
+SUBDIRS = chrome defaults
+
 extensiondir = $(datadir)/xul-ext/trackerbird
 extension_DATA = \
+	install.rdf \
 	chrome.manifest \
-	chrome \
-	chrome/skin \
-	chrome/skin/overlay.css \
-	chrome/locale \
-	chrome/locale/en-US \
-	chrome/locale/en-US/options.dtd \
-	chrome/locale/en-US/about.dtd \
-	chrome/locale/en-US/overlay.dtd \
-	chrome/locale/en-US/overlay.properties \
-	chrome/content \
-	chrome/content/mailstore.js \
-	chrome/content/options.xul \
-	chrome/content/queue.js \
-	chrome/content/namespace.js \
-	chrome/content/about.xul \
-	chrome/content/tb-overlay.xul \
-	chrome/content/plugin.js \
-	chrome/content/bindings.js \
-	chrome/content/email-address-parser.js \
-	chrome/content/persistent-store.js \
-	chrome/content/ui.js \
-	chrome/content/trackerstore.js \
-	README \
-	defaults \
-	defaults/preferences \
-	defaults/preferences/prefs.js
+	README
 
 install-data-hook:
-	$(LN_S) $(extensiondir) "$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)/{1234}"
\ No newline at end of file
+	$(LN_S) "$(extensiondir)" "$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)/trackerbird bustany org"
+
+uninstall-hook:
+	$(RM) "$(TRACKER_MINER_THUNDERBIRD_INSTALL_DIR)/trackerbird bustany org"
\ No newline at end of file
diff --git a/src/plugins/thunderbird/chrome/Makefile.am b/src/plugins/thunderbird/chrome/Makefile.am
new file mode 100644
index 0000000..8e1b19d
--- /dev/null
+++ b/src/plugins/thunderbird/chrome/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = skin locale content
diff --git a/src/plugins/thunderbird/chrome/content/Makefile.am b/src/plugins/thunderbird/chrome/content/Makefile.am
new file mode 100644
index 0000000..c2c08a2
--- /dev/null
+++ b/src/plugins/thunderbird/chrome/content/Makefile.am
@@ -0,0 +1,16 @@
+include $(top_srcdir)/Makefile.decl
+
+extensiondir = $(datadir)/xul-ext/trackerbird/chrome/content
+extension_DATA = \
+	mailstore.js \
+	options.xul \
+	queue.js \
+	namespace.js \
+	about.xul \
+	tb-overlay.xul \
+	plugin.js \
+	bindings.js \
+	email-address-parser.js \
+	persistent-store.js \
+	ui.js \
+	trackerstore.js
diff --git a/src/plugins/thunderbird/chrome/locale/Makefile.am b/src/plugins/thunderbird/chrome/locale/Makefile.am
new file mode 100644
index 0000000..0fc5e21
--- /dev/null
+++ b/src/plugins/thunderbird/chrome/locale/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = en-US
diff --git a/src/plugins/thunderbird/chrome/locale/en-US/Makefile.am b/src/plugins/thunderbird/chrome/locale/en-US/Makefile.am
new file mode 100644
index 0000000..200382e
--- /dev/null
+++ b/src/plugins/thunderbird/chrome/locale/en-US/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.decl
+
+extensiondir = $(datadir)/xul-ext/trackerbird/chrome/locale/en-US/
+extension_DATA = \
+	options.dtd \
+	about.dtd \
+	overlay.dtd \
+	overlay.properties
diff --git a/src/plugins/thunderbird/chrome/skin/Makefile.am b/src/plugins/thunderbird/chrome/skin/Makefile.am
new file mode 100644
index 0000000..c007688
--- /dev/null
+++ b/src/plugins/thunderbird/chrome/skin/Makefile.am
@@ -0,0 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
+extensiondir = $(datadir)/xul-ext/trackerbird/chrome/skin
+extension_DATA = \
+	overlay.css
diff --git a/src/plugins/thunderbird/defaults/Makefile.am b/src/plugins/thunderbird/defaults/Makefile.am
new file mode 100644
index 0000000..4c3d6b4
--- /dev/null
+++ b/src/plugins/thunderbird/defaults/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = preferences
diff --git a/src/plugins/thunderbird/defaults/preferences/Makefile.am b/src/plugins/thunderbird/defaults/preferences/Makefile.am
new file mode 100644
index 0000000..4fb9c62
--- /dev/null
+++ b/src/plugins/thunderbird/defaults/preferences/Makefile.am
@@ -0,0 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
+extensiondir = $(datadir)/xul-ext/trackerbird/defaults/preferences
+extension_DATA = \
+	prefs.js