- Try to set things up such that I can "preinstall" lightning via some

symlink chrome format tricks.  Not there yet!
- Package sqlite3 as well.
- Fix contents.rdf (just in time to replace with chrome.manifest!).
- Make sure we have a fake lightning account at startup, though, tragically,
  you need another patch for that to not spew at you.

Not part of the build.  Not even a good idea.

calendar/lightning/Makefile.in

@@ -43,8 +43,11 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= lightning
+
+ifndef LIGHTNING_IN_TREE
 export XPI_NAME	= lightning
 XPI_PKGNAME	= lightning
-DIRS		= ../../storage ../libical ../base
+DIRS		= ../../db/sqlite3/src ../../storage ../libical ../base
+endif
 
 include $(topsrcdir)/config/rules.mk

calendar/lightning/content/contents.rdf

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:lightning"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:lightning"
-	chrome:displayName="Lightning (Calendar)"
-	chrome:author="Mozilla Calendar Team"
-	chrome:name="lightning"
-	chrome:description="This extension integrates calendar functionality into Thunderbird."
-#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
-#expand chrome:skinVersion="__MOZILLA_SKIN_VERSION__"
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://lightning/content/tools-overlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>

calendar/lightning/jar.mn

@@ -1,6 +1,7 @@
 lightning.jar:
 * content/lightning/contents.rdf				(content/contents.rdf)
-  content/lightning/tools-overlay.xul				(content/tools-overlay.xul)
+  content/lightning/messenger-overlay.xul				(content/messenger-overlay.xul)
+  content/lightning/fake-account.js				(content/fake-account.js)
 
 en-US.jar:
   locale/en-US/lightning/lightning.dtd				(locale/lightning.dtd)