Skip to content

Commit 95c123d

Browse files
dwsuseigaw
authored andcommitted
build: do not overwrite conf data from main meson.build
The conf variable is already used in the main meson.build. This overwrites the conf data and makes the summary fail. Signed-off-by: Daniel Wagner <[email protected]>
1 parent f39802f commit 95c123d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

doc/rst/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ if want_docs != 'false'
88
if want_docs_build
99
kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc')
1010

11-
conf = configuration_data()
12-
conf.set('SYSCONFDIR', sysconfdir)
11+
rst_conf = configuration_data()
12+
rst_conf.set('SYSCONFDIR', sysconfdir)
1313

1414
if want_docs == 'all' or want_docs == 'rst' or want_docs == 'html'
1515
foreach apif : api_files
1616
afile = files(top_source_dir + 'src/nvme/' + apif)
1717
subst = configure_file(
1818
input: afile,
1919
output: '@[email protected]',
20-
configuration: conf)
20+
configuration: rst_conf)
2121
rst = custom_target(
2222
apif.underscorify() + '_rst',
2323
input: subst,

0 commit comments

Comments
 (0)