Bug 649810 - SeaMonkey 2.1pre Windows installer ignores extension choices. r=khuey,Mitch. a=LegNeato
authorFrank Wein <bugzilla@mcsmurf.de>
Mon, 25 Apr 2011 05:27:00 -0400
changeset 63440 f43e15acc6ca48a6a723c23eb940f39f8f00df35
parent 63438 9b8188993c1ad33f000e8cd314160be83e0c0556
child 63445 fce895bf8852201d69a1c57285dbe8b72af7a507
push id77
push userCallek@gmail.com
push dateSun, 01 May 2011 17:19:10 +0000
reviewerskhuey, Mitch, LegNeato
bugs649810
milestone2.0.2pre
Bug 649810 - SeaMonkey 2.1pre Windows installer ignores extension choices. r=khuey,Mitch. a=LegNeato
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -485,17 +485,22 @@ ifdef MOZ_OMNIJAR
 endif
 	@cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
 ifdef MOZ_OPTIONAL_PKG_LIST
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/optional
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 	  "$(call core_abspath,$(DEPTH)/installer-stage/optional)", \
 	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
 	  $(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
-	@cd $(DEPTH)/installer-stage/optional/extensions; find -maxdepth 1 -mindepth 1 -exec rm -r ../../core/extensions/{} \;
+	if test -d $(DEPTH)/installer-stage/optional/extensions ; then \
+		cd $(DEPTH)/installer-stage/optional/extensions; find -maxdepth 1 -mindepth 1 -exec rm -r ../../core/extensions/{} \; ; \
+	fi
+	if test -d $(DEPTH)/installer-stage/optional/distribution/extensions/ ; then \
+		cd $(DEPTH)/installer-stage/optional/distribution/extensions/; find -maxdepth 1 -mindepth 1 -exec rm -r ../../../core/distribution/extensions/{} \; ; \
+	fi
 endif
 
 stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
 	@rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
 # 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)