From 0856be0bd9d18b5c577ec75445800974b297f884 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Mon, 30 Apr 2012 15:19:58 +1200 Subject: [PATCH] Bug 707580, Do not remove some directories generated by |make package| when re-called, r=khuey --- toolkit/mozapps/installer/packager.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 4c63f18e8b0..1d91df4d6a5 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -778,16 +778,23 @@ ifdef USE_ELF_HACK endif stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack - @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) + @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) +ifndef MOZ_FAST_PACKAGE + @rm -rf $(DIST)/$(MOZ_PKG_DIR) +endif # NOTE: this must be a tar now that dist links into the tree so that we # do not strip the binaries actually in the tree. @echo "Creating package directory..." - @mkdir $(DIST)/$(MOZ_PKG_DIR) + if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \ + mkdir $(DIST)/$(MOZ_PKG_DIR); \ + fi ifndef UNIVERSAL_BINARY # If UNIVERSAL_BINARY, the package will be made from an already-prepared # STAGEPATH ifdef MOZ_PKG_MANIFEST +ifndef MOZ_FAST_PACKAGE $(RM) -rf $(DIST)/xpt $(DIST)/manifests +endif $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)