Bug 1019117 - Remove ssltunnel from NO_PKG_FILES conditional on having no manifest r=glandium

This commit is contained in:
Martin Thomson 2014-07-02 13:45:00 +02:00
parent 515c44d9b1
commit d305525687

View File

@ -612,7 +612,6 @@ NO_PKG_FILES += \
res/samples \ res/samples \
res/throbber \ res/throbber \
shlibsign* \ shlibsign* \
ssltunnel* \
certutil* \ certutil* \
pk12util* \ pk12util* \
BadCertServer* \ BadCertServer* \
@ -629,6 +628,13 @@ NO_PKG_FILES += \
*.dSYM \ *.dSYM \
$(NULL) $(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 # browser/locales/Makefile uses this makefile for its variable defs, but
# doesn't want the libs:: rule. # doesn't want the libs:: rule.
ifndef PACKAGER_NO_LIBS ifndef PACKAGER_NO_LIBS