Bug 1137060 - Set _RESPATH for OSX xulrunner; r=glandium a=lmandel
authorMike Shal <mshal@mozilla.com>
Thu, 26 Feb 2015 14:28:23 -0500
changeset 250397 becc3f84ea4e
parent 250396 3a27c2da51d1
child 250398 ae0452603a3a
push id4572
push usermshal@mozilla.com
push date2015-03-16 17:53 +0000
treeherdermozilla-beta@becc3f84ea4e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, lmandel
bugs1137060
milestone37.0
Bug 1137060 - Set _RESPATH for OSX xulrunner; r=glandium a=lmandel
toolkit/mozapps/installer/upload-files.mk
xulrunner/installer/Makefile.in
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -32,18 +32,20 @@ endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifndef _APPNAME
 _APPNAME = $(MOZ_MACBUNDLE_NAME)
 endif
 ifndef _BINPATH
 _BINPATH = /$(_APPNAME)/Contents/MacOS
 endif # _BINPATH
+ifndef _RESPATH
 # Resource path for the precomplete file
 _RESPATH = /$(_APPNAME)/Contents/Resources
+endif
 ifdef UNIVERSAL_BINARY
 STAGEPATH = universal/
 endif
 endif
 
 PACKAGE_BASE_DIR = $(_ABS_DIST)
 PACKAGE       = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
 
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -21,16 +21,17 @@ endif
 
 # If we're on mac, we don't want an end-user-facing DMG, we want a .tar.bz2
 # which developers then use to package their application.
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_FORMAT = BZ2
 _APPNAME = XUL.framework
 _BINPATH = /$(_APPNAME)/Versions/Current
+_RESPATH := $(_BINPATH)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 INSTALL_SDK = 1
 
 include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk