Merge in more makefile edits from repo:voltha-docs
Change-Id: Iba7f6e565b45c5e888a34bce295d8fada8ab2ce2
diff --git a/makefiles/lint/doc8/include.mk b/makefiles/lint/doc8/include.mk
index 4764fa2..22a24fa 100644
--- a/makefiles/lint/doc8/include.mk
+++ b/makefiles/lint/doc8/include.mk
@@ -29,6 +29,13 @@
# include $(ONF_MAKEDIR)/lint/doc8/help.mk
include $(ONF_MAKEDIR)/lint/doc8/install.mk
+# -----------------------------------------------------------------------
+# Well that is annoying. Cannot pass two --config switches, doc8 will
+# use only one. Repos have more special exclusions so pass onf-make
+# doc8 config as command line args so local makefiles to use --config
+# -----------------------------------------------------------------------
+# lint-doc8-args += --config $(ONF_MAKEDIR)/lint/doc8/doc8.ini
+
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
ifndef NO-LINT-DOC8
@@ -42,13 +49,15 @@
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
-lint-doc8-excl := $(foreach dir,$(onf-excl-dirs),--ignore-path "$(dir)")
+## [TODO] - move lint-doc8-excl into doc8.ini
+# lint-doc8-excl := $(foreach dir,$(onf-excl-dirs) $(lint-doc8-excl),--ignore-path "$(dir)")
+lint-doc8-excl := $(null)
lint-doc8: lint-doc8-cmd-version
$(call banner-enter,Target $@)
$(activate) && doc8 --version
@echo
- $(activate) && doc8 $(lint-doc8-excl)
+ $(activate) && doc8 $(lint-doc8-excl) $(lint-doc8-args)
$(call banner-enter,Target $@)
## -----------------------------------------------------------------------