Bug 540833, make update-packaging failed finding correct directory due to MOZ_PKG_PRETTYNAMES (mac), p=gozer r=bsmedberg
authorNick Thomas <nthomas@mozilla.com>
Thu, 11 Mar 2010 20:56:53 +1300
changeset 39267 da1d4c2324a5c32b812ac6d1d7aeb08f767b8472
parent 39266 b52f0d4b4e6947ba8109c44fd838ba70ab329211
child 39269 600a41e39ab4e375a8d27c202c36792274718ca2
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs540833
milestone1.9.3a3pre
Bug 540833, make update-packaging failed finding correct directory due to MOZ_PKG_PRETTYNAMES (mac), p=gozer r=bsmedberg
tools/update-packaging/Makefile.in
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -51,22 +51,22 @@ include $(topsrcdir)/toolkit/mozapps/ins
 PACKAGE_BASE_DIR	= $(DIST)
 
 # Default output location for update archive
 STAGE_DIR	= $(DIST)/$(PKG_UPDATE_PATH)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifdef UNIVERSAL_BINARY
 ifneq (,$(filter %/l10n-stage,$(PACKAGE_BASE_DIR)))
-PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
+PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)/$(MOZ_APP_DISPLAYNAME).app
 else
-PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/universal/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
+PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/universal/$(MOZ_PKG_DIR)/$(MOZ_APP_DISPLAYNAME).app
 endif
 else
-PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
+PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)/$(MOZ_APP_DISPLAYNAME).app
 endif
 else
 PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)
 endif
 
 MAR_BIN	= $(LIBXUL_DIST)/host/bin/mar$(HOST_BIN_SUFFIX)
 MBSDIFF_BIN	= $(LIBXUL_DIST)/host/bin/mbsdiff$(HOST_BIN_SUFFIX)