Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix im/build.mk, r=clokep.
authorFlorian Quèze <florian@queze.net>
Wed, 13 Aug 2014 17:50:18 +0200
changeset 16462 3c377dcfb242f8d21d24e16598a5c0a0c6ff4ee1
parent 16461 f299fe99916d8530e8bfc55ac861387a3df45889
child 16463 c485bd6ba728520a0885e5c8a36c55a2306ccea1
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs1035599
Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix im/build.mk, r=clokep.
im/build.mk
--- a/im/build.mk
+++ b/im/build.mk
@@ -1,14 +1,18 @@
 # 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/.
 
 ifndef COMM_BUILD
 
+ifndef MOZILLA_DIR
+MOZILLA_DIR = $(topsrcdir)
+endif
+# included to get $(BUILDID), which needs $(MOZILLA_DIR)
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 BUILD_YEAR := $(shell echo $(BUILDID) | cut -c 1-4)
 BUILD_MONTH := $(shell echo $(BUILDID) | cut -c 5-6)
 BUILD_DAY := $(shell echo $(BUILDID) | cut -c 7-8)
 BUILD_HOUR := $(shell echo $(BUILDID) | cut -c 9-10)
 
 ifndef PKG_SUFFIX
@@ -68,17 +72,17 @@ FORCE_UPDATE := components/components.li
 
 #If there's a symbol server:
 # SYMBOL_SERVER_HOST=symbols.instantbird.org
 # SYMBOL_SERVER_PATH=/www/instantbird/socorro/symbols
 # SYMBOL_SERVER_PORT=22
 # SYMBOL_SERVER_USER=buildbot
 
 distribution:
-	@$(MAKE) -C mozilla MAKE_SYM_STORE_PATH=$(MAKE_SYM_STORE_PATH) SYM_STORE_SOURCE_DIRS='$(topsrcdir)/mozilla/extensions/purple $(topsrcdir)/mozilla $(topsrcdir)' buildsymbols
+	@$(MAKE) MAKE_SYM_STORE_PATH=$(MAKE_SYM_STORE_PATH) SYM_STORE_SOURCE_DIRS='$(topsrcdir)/mozilla/extensions/purple $(topsrcdir)/mozilla $(topsrcdir)' buildsymbols
 	@$(MAKE) -C im/installer libs installer
 ifdef ENABLE_TESTS
 	$(MAKE) xpcshell-tests
 endif
 ifdef MOZ_UPDATE_PACKAGING
 	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update PKG_INST_PATH=
 endif
 ifdef L10NBASEDIR