Port bug 741014 - pymake is busted with make l10n-check - to help fix l10n repack bustage on Windows. rs=port-by-build-system-peer,a=Standard8
authorMark Banner <standard8@mozilla.com>
Thu, 17 Apr 2014 21:26:43 +0100
changeset 19436 ff5101cc8e059f551822b71d23825a2fe1283b43
parent 19435 8b54c0720272196a58bbcb887a029bcdf52ef12e
child 19437 8b74fb8d347c8d60b1e6576ca99fcd3444ad0eee
push idunknown
push userunknown
push dateunknown
reviewersport-by-build-system-peer, Standard8
bugs741014
Port bug 741014 - pymake is busted with make l10n-check - to help fix l10n repack bustage on Windows. rs=port-by-build-system-peer,a=Standard8
mail/locales/Makefile.in
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -86,31 +86,33 @@ libs-%:
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 
 # Note the funny extra "../" in SFX_HEADER is because the repackage-zip command
 # is actually run effectively from within the mozilla/ part of the objdir, so
 # topsrcdir points to the wrong place and we have to go one directory higher.
 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
-repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
+repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
 	$(MAKE) repackage-zip \
 	  AB_CD=$(AB_CD) \
 	  MOZ_PKG_FORMAT=SFX7Z \
 	  ZIP_IN=$(WIN32_INSTALLER_IN) \
 	  ZIP_OUT=$(WIN32_INSTALLER_OUT) \
 	  SFX_HEADER="$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
 	              $(_ABS_SRCDIR)/mail/installer/windows/app.tag"
 
 ifeq (WINNT,$(OS_ARCH))
-repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%
+repackage-win32-installer-%: $(STAGEDIST)
 	@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN)
+
+repackage-zip-%: repackage-win32-installer-%
 else
 repackage-win32-installer-%: ;
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS
 else
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)