Bug 540833 - Fix l10n repackaging for branded builds. Bustage fix. r+a=Standard8 CLOSED TREE / RELEASE BRANCH ONLY COMM192_20100119_RELBRANCH THUNDERBIRD_3_1_a1_BUILD3 THUNDERBIRD_3_1_a1_RELEASE THUNDERBIRD_3_1_a2_BUILD1 THUNDERBIRD_3_1_a2_RELEASE
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Tue, 02 Feb 2010 12:14:04 -0500
branchCOMM192_20100119_RELBRANCH
changeset 33551 4c949e59cf956429b89328e90dece30751032690
parent 33525 4097fcf054b289c0fe8478a394f270922af9e723
child 33552 c8c82305a81027c985f13d39c8bcfb9d07131d76
push id1042
push usergozer@mozillamessaging.com
push dateTue, 02 Feb 2010 17:15:05 +0000
bugs540833
milestone1.9.2pre
Bug 540833 - Fix l10n repackaging for branded builds. Bustage fix. r+a=Standard8 CLOSED TREE / RELEASE BRANCH ONLY
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)
 
 ifneq (,$(filter mac 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)