From: Mauro Carvalho Chehab Date: Thu, 24 Apr 2025 00:16:21 +0000 (+0800) Subject: docs: Makefile: get rid of KERNELDOC_CONF env variable X-Git-Tag: v6.16-rc1~176^2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a9b59228d5a9827d969fc3b1b420fa0a985842;p=thirdparty%2Fkernel%2Flinux.git docs: Makefile: get rid of KERNELDOC_CONF env variable Despite its name, what's there is a set of Sphinx arguments that are passed to sphinx/kerneldoc.py: - kerneldoc_srctree: location of the source tree; - kerneldoc_bin: external script to excecute kernel-doc Drop it, and just place the values at the already-existing ALLSPHINXOPTS variable. Signed-off-by: Mauro Carvalho Chehab Tested-by: Andy Shevchenko Signed-off-by: Jonathan Corbet Message-ID: <88be0fc288598c30fbedb9cc230b2a7ed28225a2.1745453655.git.mchehab+huawei@kernel.org> --- diff --git a/Documentation/Makefile b/Documentation/Makefile index c022b97c487e8..a006c7681412a 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -61,8 +61,8 @@ endif #HAVE_LATEXMK PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter KERNELDOC = $(srctree)/scripts/kernel-doc.py -KERNELDOC_CONF = -D kerneldoc_srctree=$(srctree) -D kerneldoc_bin=$(KERNELDOC) -ALLSPHINXOPTS = $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) +ALLSPHINXOPTS = -D kerneldoc_srctree=$(srctree) -D kerneldoc_bin=$(KERNELDOC) +ALLSPHINXOPTS += $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ifneq ($(wildcard $(srctree)/.config),) ifeq ($(CONFIG_RUST),y) # Let Sphinx know we will include rustdoc