Bug 1137060 - Set _RESPATH for OSX xulrunner; r=glandium a=lmandel

2015-02-26 14:28:23 -05:00
parent d37cd81a4c
commit cd5b6ad12f
2 changed files with 3 additions and 0 deletions
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -37,8 +37,10 @@ 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
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -26,6 +26,7 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_FORMAT = BZ2
 _APPNAME = XUL.framework
 _BINPATH = /$(_APPNAME)/Versions/Current
+_RESPATH := $(_BINPATH)
 endif

 include $(topsrcdir)/config/rules.mk