Bug 1019117 - Remove ssltunnel from NO_PKG_FILES conditional on having no manifest r=glandium
☠☠ backed out by 1666abb2ef67 ☠ ☠
authorMartin Thomson <martin.thomson@gmail.com>
Wed, 02 Jul 2014 13:45:00 +0200
changeset 205901 7f3c2ac7856dcacf281d03a75640f30ce184ad11
parent 205900 f2dda6439e4272c7cf7f920a2d3629da9b0e0114
child 205902 08dbe7a6bb0731f97c4d8e4fe62afa6fe3200f07
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs1019117
milestone33.0a1
Bug 1019117 - Remove ssltunnel from NO_PKG_FILES conditional on having no manifest r=glandium
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -607,33 +607,39 @@ NO_PKG_FILES += \
 	mfc* \
 	msdump* \
 	msmap* \
 	nm2tsv* \
 	nsinstall* \
 	res/samples \
 	res/throbber \
 	shlibsign* \
-	ssltunnel* \
 	certutil* \
 	pk12util* \
 	BadCertServer* \
 	OCSPStaplingServer* \
 	GenerateOCSPResponse* \
 	winEmbed.exe \
 	chrome/chrome.rdf \
 	chrome/app-chrome.manifest \
 	chrome/overlayinfo \
 	components/compreg.dat \
 	components/xpti.dat \
 	content_unit_tests \
 	necko_unit_tests \
 	*.dSYM \
 	$(NULL)
 
+# If a manifest has not been supplied, the following
+# files should be excluded from the package too
+ifndef MOZ_PKG_MANIFEST
+NO_PKG_FILES += \
+	ssltunnel* \
+endif
+
 # browser/locales/Makefile uses this makefile for its variable defs, but
 # doesn't want the libs:: rule.
 ifndef PACKAGER_NO_LIBS
 libs:: make-package
 endif
 
 DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX) -DBIN_SUFFIX=$(BIN_SUFFIX)