Skip to content

Commit

Permalink
build: do not overwrite conf data from main meson.build
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
igaw committed Jul 12, 2024
1 parent f39802f commit 10f2d52
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions doc/rst/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ if want_docs != 'false'
if want_docs_build
kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc')

conf = configuration_data()
conf.set('SYSCONFDIR', sysconfdir)
rst_conf = configuration_data()
rst_conf.set('SYSCONFDIR', sysconfdir)

if want_docs == 'all' or want_docs == 'rst' or want_docs == 'html'
foreach apif : api_files
afile = files(top_source_dir + 'src/nvme/' + apif)
subst = configure_file(
input: afile,
output: '@[email protected]',
configuration: conf)
configuration: rst_conf)
rst = custom_target(
apif.underscorify() + '_rst',
input: subst,
Expand Down

0 comments on commit 10f2d52

Please sign in to comment.