Fix bug 791983 - Save users from polluting their dist/bin when building Lightning. r=Standard8
authorPhilipp Kewisch <mozilla@kewis.ch>
Sun, 21 Oct 2012 13:37:22 +0200
changeset 12632 117e2e975798a5d1f863e7296f8d53c62b091aa1
parent 12631 c8c2a3ed3d9a0e1c5985ba607d23106770f6b48f
child 12633 ec54df727248159ab65fecfa03934c3c2fcbb57e
push id796
push userbugzilla@standard8.plus.com
push dateMon, 19 Nov 2012 22:27:00 +0000
treeherdercomm-aurora@c16a2db13b6f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs791983
Fix bug 791983 - Save users from polluting their dist/bin when building Lightning. r=Standard8
calendar/Makefile.in
calendar/lightning/app-config.mk
mail/app-config.mk
--- a/calendar/Makefile.in
+++ b/calendar/Makefile.in
@@ -4,16 +4,22 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_SUNBIRD
 MODULE = calendar
 DIRS = libical resources base providers import-export locales
+else
+ifdef MOZ_CALENDAR
+DIRS = lightning
+endif
+endif
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/app-config.mk
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# If we are in one of the calendar directories, then make sure that files end
+# up in xpi-stage/lightning.
+ifeq (calendar,$(firstword $(subst /, ,$(subst $(topsrcdir)/,,$(srcdir)))))
+# Possibly XPI_NAME is already set, i.e in the timezones extension. Don't
+# override this.
+ifndef XPI_NAME
+export XPI_NAME = lightning
+export USE_EXTENSION_MANIFEST = 1
+endif
+endif
--- a/mail/app-config.mk
+++ b/mail/app-config.mk
@@ -1,6 +1,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_THUNDERBIRD = 1
 DEFINES += -DMOZ_THUNDERBIRD=1
+
+ifdef MOZ_CALENDAR
+include $(topsrcdir)/calendar/lightning/app-config.mk
+endif