doc: prefix local mandir and htmldir paths

igaw · igaw · commit 09aa951e86c6 · 2026-03-11T17:29:44.000+01:00
The man and html documenation directory should use the user defined
prefixdir. Ideally, this would be fixed in the main meson.build.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/Documentation/meson.build b/Documentation/meson.build
@@ -268,8 +268,8 @@ adoc_includes = [
 ]
 
 if want_docs != 'false'
-    mandir = join_paths(get_option('mandir'), 'man1')
-    htmldir = join_paths(get_option('htmldir'), 'nvme')
+    mandir = join_paths(prefixdir, get_option('mandir'), 'man1')
+    htmldir = join_paths(prefixdir, get_option('htmldir'), 'nvme')
 
     asciidoctor = find_program('asciidoc', required: want_docs_build)
     if want_docs_build and asciidoctor.found()

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,8 @@ adoc_includes = [`
`268`	`268`	`]`
`269`	`269`
`270`	`270`	`if want_docs != 'false'`
`271`		`- mandir = join_paths(get_option('mandir'), 'man1')`
`272`		`- htmldir = join_paths(get_option('htmldir'), 'nvme')`
	`271`	`+ mandir = join_paths(prefixdir, get_option('mandir'), 'man1')`
	`272`	`+ htmldir = join_paths(prefixdir, get_option('htmldir'), 'nvme')`
`273`	`273`
`274`	`274`	`asciidoctor = find_program('asciidoc', required: want_docs_build)`
`275`	`275`	`if want_docs_build and asciidoctor.found()`