Bug 835164 Unbreak Seamonkey and Xulrunner mac universal builds after bug 834228 r=Callek.
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 29 Jan 2013 09:35:53 +0100
changeset 11855 4f09ff153f86167bfcc980fc1a9a32c28c20ca40
parent 11854 d974df0945d35b38d16fa570e3b22df1c383989e
child 11856 f91edf2379569166bd13caed8c880049a23b9518
push id8832
push userphilip.chee@gmail.com
push dateTue, 29 Jan 2013 18:00:54 +0000
treeherdercomm-central@4f09ff153f86 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs835164, 834228
Bug 835164 Unbreak Seamonkey and Xulrunner mac universal builds after bug 834228 r=Callek.
build/macosx/universal/flight.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -23,17 +23,17 @@ core_abspath = $(if $(filter /%,$(1)),$(
 DIST = $(OBJDIR)/mozilla/dist
 
 postflight_all:
 	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
 	rm -f $(DIST_ARCH_2)/universal
 	ln -s $(call core_abspath,$(DIST_UNI)) $(DIST_ARCH_2)/universal
 # Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
 # actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
-	$(MAKE) -C $(OBJDIR_ARCH_1)/$(INSTALLER_DIR) \
+	$(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
 	   PKG_SKIP_STRIP=1 stage-package
 ifdef ENABLE_TESTS
 # Now, repeat the process for the test package.
 	$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	rm -rf $(DIST_UNI)/test-package-stage
 # automation.py differs because it hardcodes a path to
 # dist/bin. It doesn't matter which one we use.