From d305525687ab2b5f75ede363d8e8f287728c7b99 Mon Sep 17 00:00:00 2001
From: Martin Thomson <martin.thomson@gmail.com>
Date: Wed, 2 Jul 2014 13:45:00 +0200
Subject: [PATCH] Bug 1019117 - Remove ssltunnel from NO_PKG_FILES conditional
 on having no manifest r=glandium

---
 toolkit/mozapps/installer/packager.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index ba1cb54dbb5..c74019bbc65 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -612,7 +612,6 @@ NO_PKG_FILES += \
 	res/samples \
 	res/throbber \
 	shlibsign* \
-	ssltunnel* \
 	certutil* \
 	pk12util* \
 	BadCertServer* \
@@ -629,6 +628,13 @@ NO_PKG_FILES += \
 	*.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