linux-kernel - Re: [PATCH 1/2] docs: Makefile: use the right path for DOCS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <98078a61-dcc5-9e52-f6fc-9bd3b8be6d25@infradead.org>
Date:   Sat, 11 Dec 2021 09:12:45 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Linux Doc Mailing List <linux-doc@...r.kernel.org>,
        Jonathan Corbet <corbet@....net>
Cc:     linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] docs: Makefile: use the right path for DOCS_CSS



On 12/11/21 00:56, Mauro Carvalho Chehab wrote:
> When make is used with O=<dir>, the location of the css file
> won't be get right:
> 
> 	$ make DOCS_THEME=nature DOCS_CSS=my_css.css    O=DOCS SPHINXDIRS=x86 -j9 htmldocs
> 	make[1]: Entering directory '/work/lnx/next/next-2021-1210/DOCS'
> 	...
> 	cp: cannot stat 'my_css.css': No such file or directory
> 
> Fix it in a way that both relative and absolute paths will be
> handled.
> 
> Reported-by: Randy Dunlap <rdunlap@...radead.org>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>

Reviewed-by: Randy Dunlap <rdunlap@...radead.org>
Tested-by: Randy Dunlap <rdunlap@...radead.org>

Thanks.

> ---
> 
> See [PATCH 0/2] at: https://lore.kernel.org/all/cover.1639212812.git.mchehab+huawei@kernel.org/
> 
>  Documentation/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 9f0f53db2f10..c9543b63dc6a 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -88,7 +88,7 @@ quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
>  	$(abspath $(srctree)/$(src)/$5) \
>  	$(abspath $(BUILDDIR)/$3/$4) && \
>  	if [ "x$(DOCS_CSS)" != "x" ]; then \
> -		cp $(DOCS_CSS) $(BUILDDIR)/$3/_static/; \
> +		cp $(if $(patsubst /%,,$(DOCS_CSS)),$(abspath $(srctree)/$(DOCS_CSS)),$(DOCS_CSS)) $(BUILDDIR)/$3/_static/; \
>  	fi
>  
>  htmldocs:
> 

-- 
~Randy