From ff7204edd56d0413563a2d87372153e5b764142c Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Fri, 18 Jul 2008 16:24:31 +0000 Subject: [PATCH] bug 440017 - include config.mk before using INSTALL_LIGHTNING so that var can be set, most significant part of the patch by dmose, r=ause git-svn-id: svn://10.0.0.236/trunk@253113 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/calendar/lightning/Makefile.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mozilla/calendar/lightning/Makefile.in b/mozilla/calendar/lightning/Makefile.in index bfee4041d09..3582e72a7b0 100644 --- a/mozilla/calendar/lightning/Makefile.in +++ b/mozilla/calendar/lightning/Makefile.in @@ -21,6 +21,7 @@ # Mike Shaver # Matthew Willis # Philipp Kewisch +# Dan Mosedale # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or @@ -60,9 +61,13 @@ ifdef LIGHTNING_FIREFOX FIREFOX_VERSION := $(shell cat $(MOZILLA_SRCDIR)/browser/config/version.txt) endif -# don't install by default, it causes problems on tinderboxes -# (for example, see bug 406441) -ifdef INSTALL_LIGHTNING +# include config.mk here so myconfig or app-config can set DISABLE_LIGHTNING_INSTALL +include $(topsrcdir)/config/config.mk + +# installing lightning in a thunderbird build causes problems on tinderboxes +# (see bug 406441 and bug 440017), so we need to provide a hook for the +# tinderboxen to disable that. +ifndef DISABLE_LIGHTNING_INSTALL ifndef MOZ_SUNBIRD # install Lightning as a global extension in dist/bin/extensions/ INSTALL_EXTENSION_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}