From bd4e8e5a68da997397ab30ba67610eb15be8e0c4 Mon Sep 17 00:00:00 2001 From: "rob_strong%exchangecode.com" Date: Tue, 9 Oct 2007 19:30:28 +0000 Subject: [PATCH] Bug 398867 - Building installer without a MOZ_OPTIONAL_PKG_LIST copies all files into the optional directory. r=bsmedberg, a1.9=mconnor git-svn-id: svn://10.0.0.236/trunk@237473 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/mozapps/installer/packager.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mozilla/toolkit/mozapps/installer/packager.mk b/mozilla/toolkit/mozapps/installer/packager.mk index 723c6fcb325..cacd8beec4f 100644 --- a/mozilla/toolkit/mozapps/installer/packager.mk +++ b/mozilla/toolkit/mozapps/installer/packager.mk @@ -315,10 +315,12 @@ endif "$(DEPTH)/installer-stage/localized", \ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \ $(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) ) +ifdef MOZ_OPTIONAL_PKG_LIST $(call PACKAGER_COPY, "$(DIST)",\ "$(DEPTH)/installer-stage/optional", \ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \ $(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) ) +endif $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v -x "$(XPIDL_LINK)" stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)