diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in index 48cdf643d4e0..0d920b71cf95 100644 --- a/tools/update-packaging/Makefile.in +++ b/tools/update-packaging/Makefile.in @@ -28,9 +28,6 @@ full-update:: complete-patch ifeq ($(OS_TARGET), WINNT) MOZ_PKG_FORMAT := SFX7Z UNPACKAGE = '$(subst $(DIST),$(ABS_DIST),$(INSTALLER_PACKAGE))' -ifdef AB_CD -UNPACKAGE = '$(PACKAGE_BASE_DIR)/$(PACKAGE)' -endif endif include $(topsrcdir)/config/rules.mk @@ -52,10 +49,13 @@ endif dir-stage := $(call mkdir_deps,$(STAGE_DIR)) complete-patch:: $(dir-stage) +# unpack the windows installer, unless we're an l10n repack, we just packed this +ifndef IS_LANGUAGE_REPACK ifeq ($(OS_TARGET), WINNT) test -f $(UNPACKAGE) $(RM) -rf '$(PACKAGE_DIR)' cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE) +endif endif MAR=$(MAR_BIN) \ MOZ_PRODUCT_VERSION=$(MOZ_APP_VERSION) \