Bug 556644: Fix bustage in l10n repack code
authorMichael Wu <mwu@mozilla.com>
Thu, 12 Aug 2010 23:03:24 -0700
changeset 50383 e63e4c634f7576f6219faad12ea37f8bb09f115c
parent 50382 3bfef869720e7dc0ca78e54d88d61656ebd56c11
child 50384 53bf594b6fb6c0691e445c880bc515b7ac59f80b
push idunknown
push userunknown
push dateunknown
bugs556644
milestone2.0b4pre
Bug 556644: Fix bustage in l10n repack code
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -131,24 +131,24 @@ MAKE_SDK = $(ZIP) -r9D $(SDK) $(MOZ_APP_
 endif
 ifeq ($(MOZ_PKG_FORMAT),CAB)
 PKG_SUFFIX	= .cab
 INNER_MAKE_PACKAGE	= $(MAKE_CAB)
 INNER_UNMAKE_PACKAGE	= $(error Unpacking CAB files is not supported)
 endif
 ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
 PKG_SUFFIX	= .exe
-_MAKE_PACKAGE	= rm -f app.7z && \
+INNER_MAKE_PACKAGE	= rm -f app.7z && \
   mv $(MOZ_PKG_DIR) core && \
   $(CYGWIN_WRAPPER) 7z a -r -t7z app.7z -mx -m0=BCJ2 -m1=LZMA:d24 \
     -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 && \
   mv core $(MOZ_PKG_DIR) && \
   cat $(SFX_HEADER) app.7z > $(PACKAGE) && \
   chmod 0755 $(PACKAGE)
-_UNMAKE_PACKAGE	= $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) && \
+INNER_UNMAKE_PACKAGE	= $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) && \
   mv core $(MOZ_PKG_DIR)
 endif
 ifeq ($(MOZ_PKG_FORMAT),DMG)
 ifndef _APPNAME
 ifdef MOZ_DEBUG
 _APPNAME	= $(MOZ_APP_DISPLAYNAME)Debug.app
 else
 _APPNAME	= $(MOZ_APP_DISPLAYNAME).app