Bug 962420 - repack failure during SeaMonkey 2.24b1 release. [tentative] r=glandium a=Callek for CLOSED TREE SEA_COMM270_20140117_RELBRANCH SEAMONKEY_2_24b1_BUILD2
authorJustin Wood <Callek@gmail.com>
Thu, 23 Jan 2014 22:15:21 -0500
branchSEA_COMM270_20140117_RELBRANCH
changeset 16830 580d148b84264fdd7677d219db3cd3ad140e628d
parent 16827 ff6a84d5e59f3f5b598a69e4002835dda40eb72b
child 16832 01eb00a6fab98fb325aedc23657257f1060470a3
push idunknown
push userunknown
push dateunknown
reviewersglandium, Callek
bugs962420
Bug 962420 - repack failure during SeaMonkey 2.24b1 release. [tentative] r=glandium a=Callek for CLOSED TREE
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -149,32 +149,32 @@ libs-%:
 	fi
 	@if test -d ../../mozilla/extensions/venkman; then \
 	  $(MAKE) -C ../../mozilla/extensions/venkman/locales libs-$*; \
 	fi
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 
-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: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES)
 	@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) \
+	  ZIP_IN='$(WIN32_INSTALLER_IN)' \
+	  ZIP_OUT='$(WIN32_INSTALLER_OUT)' \
 	  SFX_HEADER="$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
 	              $(_ABS_SRCDIR)/suite/installer/windows/app.tag"
 
 ifeq (WINNT,$(OS_ARCH))
-repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%
-	@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN)
+repackage-win32-installer-%: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) libs-%
+	@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)'
 else
 repackage-win32-installer-%: ;
 endif
 
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS
 # leave out $(STAGEPATH) as we never have a universal/ subdir here
 PKG_DMG_SOURCE = $(MOZ_PKG_APPNAME)
@@ -202,17 +202,17 @@ repackage-extensions: $(STAGEDIST)
 	fi
 	if test -d ../../mozilla/extensions/venkman; then \
 	  $(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
 	fi
 ifdef MOZ_OMNIJAR
 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST);
 endif
 
-repackage-zip-%: $(ZIP_IN) $(STAGEDIST) libs-%
+repackage-zip-%: $(call ESCAPE_WILDCARD,$(ZIP_IN)) $(STAGEDIST) libs-%
 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
 
 langpack: langpack-$(AB_CD)
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack an installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.