docs: don't pull branding bits in unconditionally

...just do it when actually requested for the main image part.

docs: don't pull branding bits in unconditionally
3c65c498 · Michael Shigorin · eae7b38c · 3c65c498
Commit 3c65c498 authored Apr 22, 2016 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

30-docs.mk features.in/docs/lib/30-docs.mk +3 -1

No files found.
--- a/features.in/docs/lib/30-docs.mk
+++ b/features.in/docs/lib/30-docs.mk
@@ -5,8 +5,10 @@ DOT_BASE += docs-$(DOCS)
 CHROOT_PACKAGES += docs-$(DOCS)
 endif

-ifneq (,$(BRANDING))
+ifneq (,$(findstring notes,$(THE_BRANDING) $(INSTALL2_BRANDING)))
 CHROOT_PACKAGES_REGEXP += $(call branding,notes)
 endif

+ifneq (,$(findstring indexhtml,$(THE_BRANDING)))
 CHROOT_PACKAGES_REGEXP += $(call branding,indexhtml)
+endif