Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@253113 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kairo%kairo.at
2008-07-18 16:24:31 +00:00
parent 1debc0d24d
commit ff7204edd5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/calendar/lightning/Makefile.in
View File

@@ -21,6 +21,7 @@
# Mike Shaver <shaver@off.net>
# Matthew Willis <lilmatt@mozilla.com>
# Philipp Kewisch <mozilla@kewis.ch>
# Dan Mosedale <dmose@mozilla.org>
#
# 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}