fix DIRS badness, make sure we pull in storage, overlay better

calendar/lightning/Makefile.in

@@ -45,6 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= lightning
 export XPI_NAME	= lightning
 XPI_PKGNAME	= lightning
-DIRS		= $(topsrcdir)/calendar/libical $(topsrcdir)/calendar/base
+DIRS		= ../../storage ../libical ../base
 
 include $(topsrcdir)/config/rules.mk

calendar/lightning/content/contents.rdf

@@ -20,10 +20,10 @@
 
   <!-- overlay information -->
   <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
+    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
   </RDF:Seq>
 
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
+  <RDF:Seq about="chrome://messenger/content/messenger.xul">
     <RDF:li>chrome://lightning/content/tools-overlay.xul</RDF:li>
   </RDF:Seq>