Permalink
Browse files

Bug 649810 - SeaMonkey 2.1pre Windows installer ignores extension cho…

…ices. r=khuey,Mitch. a=LegNeato (for relbranch)

--HG--
branch : GECKO201_2011041321_RELBRANCH
  • Loading branch information...
1 parent 1125260 commit 15b4f968d67513af1e0e3ce5bdb885a91abbadcc Frank Wein committed Apr 25, 2011
Showing with 6 additions and 1 deletion.
  1. +6 −1 toolkit/mozapps/installer/packager.mk
View
7 toolkit/mozapps/installer/packager.mk
@@ -490,7 +490,12 @@ ifdef MOZ_OPTIONAL_PKG_LIST
"$(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)

0 comments on commit 15b4f96

Please sign in to comment.